Merge pull request #5961 from owncloud/core-fixgetfiletempfilecondition

Fixed getLocalFile() condition for x-send-file
11 years ago · 30b8f4ec8e
parent 8bc339413b 726a202cdb
commit 30b8f4ec8e
1 changed files with 5 additions and 3 deletions
--- 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)) {