mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into encryption_check_if_file_is_encrypted

This commit is contained in:
Bjoern Schiessle 2013-11-20 14:45:04 +01:00
parent f3e2a63712 30b8f4ec8e
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

4
lib/private/files.php
View File

@ -131,11 +131,13 @@ 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) {
list($storage) = \OC\Files\Filesystem::resolvePath(\OC\Files\Filesystem::getView()->getAbsolutePath($filename));
if ($storage instanceof \OC\Files\Storage\Local) { if ($storage instanceof \OC\Files\Storage\Local) {
self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename)); 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)) {
header("HTTP/1.0 404 Not Found"); header("HTTP/1.0 404 Not Found");
$tmpl = new OC_Template('', '404', 'guest'); $tmpl = new OC_Template('', '404', 'guest');