wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into encryption_check_if_file_is_encrypted

Browse source
This commit is contained in:
Bjoern Schiessle 2013-11-20 14:45:04 +01:00
commit b4e7258a04
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/files.php
View file

@ -131,9 +131,11 @@ class OC_Files {
if ($filesize > -1) { if ($filesize > -1) {
header("Content-Length: ".$filesize); header("Content-Length: ".$filesize);
} }
list($storage) = \OC\Files\Filesystem::resolvePath($filename); if ($xsendfile) {
if ($storage instanceof \OC\Files\Storage\Local) { list($storage) = \OC\Files\Filesystem::resolvePath(\OC\Files\Filesystem::getView()->getAbsolutePath($filename));
self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename)); if ($storage instanceof \OC\Files\Storage\Local) {
self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename));
}
} }
} }
} elseif ($zip or !\OC\Files\Filesystem::file_exists($filename)) { } elseif ($zip or !\OC\Files\Filesystem::file_exists($filename)) {