diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-20 14:45:04 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-20 14:45:04 +0100 |
| commit | b4e7258a04f9b634031984aea655ed964aa003d3 (patch) | |
| tree | 1ba77b2830ad6b2e1fce436bf5c4e1b8d6e15fe7 | |
| parent | f3e2a63712e3306c5bb1cad1921da4a3ff542474 (diff) | |
| parent | 30b8f4ec8e3dbf8e2d5d3627e0447bc20da50335 (diff) | |
| download | nextcloud-server-b4e7258a04f9b634031984aea655ed964aa003d3.tar.gz nextcloud-server-b4e7258a04f9b634031984aea655ed964aa003d3.zip | |
Merge branch 'master' into encryption_check_if_file_is_encrypted
| -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)) { |