Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-02-11 20:03:55 +0400
committerVincent Petry <pvince81@owncloud.com>2014-02-11 20:03:55 +0400
commitad813da7b1336a0f5426e2defe0d790bb96b9d58 (patch)
treefcf96dd08cb5990532b460f71bdceb2411e22956
parent23985428eaf832c3013643a2952e108d6b0a512c (diff)
parentb4f04c18dbcae4ad689d1bac85d53643347ca296 (diff)
Merge pull request #7157 from owncloud/stable6-xsendfilequotacheck
Fix xsendfile local storage detection with quota
-rw-r--r--lib/private/files.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/files.php b/lib/private/files.php
index 8ce632013cf..0ec051cbfa5 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -131,6 +131,9 @@ class OC_Files {
}
if ($xsendfile) {
list($storage) = \OC\Files\Filesystem::resolvePath(\OC\Files\Filesystem::getView()->getAbsolutePath($filename));
+ if ($storage instanceof \OC\Files\Storage\Wrapper\Wrapper) {
+ $storage = $storage->getWrapperStorage();
+ }
if ($storage instanceof \OC\Files\Storage\Local) {
self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename));
}