summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-03-27 09:31:17 +0100
committerVincent Petry <pvince81@owncloud.com>2014-03-27 09:31:17 +0100
commitc9ccacb9ea8509335dd17ccad94305f6004f1900 (patch)
tree0d9598f1fd72f4c5f7bdddf71d8b3a6f714f63ae
parented0cba0ff4f84c9bae83ecfe7b7b6bdcb2169413 (diff)
parentb48510c978810a485f3ab72b28ec1c32350a6332 (diff)
downloadnextcloud-server-c9ccacb9ea8509335dd17ccad94305f6004f1900.tar.gz
nextcloud-server-c9ccacb9ea8509335dd17ccad94305f6004f1900.zip
Merge pull request #7902 from owncloud/ext-xsendfileextstoragefix
Use the correct resolve method to resolve file storage (x-sendfile)
-rw-r--r--lib/private/files.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/files.php b/lib/private/files.php
index 7e7a27f48dc..bfe6d3c02da 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -148,8 +148,9 @@ class OC_Files {
set_time_limit($executionTime);
} else {
if ($xsendfile) {
+ $view = \OC\Files\Filesystem::getView();
/** @var $storage \OC\Files\Storage\Storage */
- list($storage) = \OC\Files\Filesystem::resolvePath($filename);
+ list($storage) = $view->resolvePath($filename);
if ($storage->isLocal()) {
self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename));
} else {