diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2013-11-20 05:42:21 -0800 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2013-11-20 05:42:21 -0800 |
| commit | 30b8f4ec8e3dbf8e2d5d3627e0447bc20da50335 (patch) | |
| tree | a80f281d2b2bde1cefab973ede198d42888414a0 | |
| parent | 8bc339413ba2221fea9447f91ae093f3f1cf2ab4 (diff) | |
| parent | 726a202cdb9471a0bc4c6c27e59469af1e39a32e (diff) | |
| download | nextcloud-server-30b8f4ec8e3dbf8e2d5d3627e0447bc20da50335.tar.gz nextcloud-server-30b8f4ec8e3dbf8e2d5d3627e0447bc20da50335.zip | |
Merge pull request #5961 from owncloud/core-fixgetfiletempfilecondition
Fixed getLocalFile() condition for x-send-file
| -rw-r--r-- | lib/private/files.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/private/files.php b/lib/private/files.php index 8b4d5c59aee..e76dd8644c1 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -131,9 +131,11 @@ class OC_Files { if ($filesize > -1) { header("Content-Length: ".$filesize); } - list($storage) = \OC\Files\Filesystem::resolvePath($filename); - if ($storage instanceof \OC\Files\Storage\Local) { - self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename)); + if ($xsendfile) { + list($storage) = \OC\Files\Filesystem::resolvePath(\OC\Files\Filesystem::getView()->getAbsolutePath($filename)); + if ($storage instanceof \OC\Files\Storage\Local) { + self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename)); + } } } } elseif ($zip or !\OC\Files\Filesystem::file_exists($filename)) { |