summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-02-05 11:40:26 +0100
committerGitHub <noreply@github.com>2018-02-05 11:40:26 +0100
commit30d6fd7f01e0fb47c23c3e12ca17dc2ab8d4c287 (patch)
tree3fb179eef61ceee2f19d94f0a653f7240541e661
parentc592abe8bad2127cf06118e42beedcadeeecd107 (diff)
parent53a780e31cbe903fbec7a8c5f11b5f994b88d8bf (diff)
downloadnextcloud-server-30d6fd7f01e0fb47c23c3e12ca17dc2ab8d4c287.tar.gz
nextcloud-server-30d6fd7f01e0fb47c23c3e12ca17dc2ab8d4c287.zip
Merge pull request #8160 from nextcloud/fix_8047
Do not try to get the jailed path if we can't find the id
-rw-r--r--lib/private/Files/Cache/Wrapper/CacheJail.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php
index 357851bedd5..1ad00ba44c5 100644
--- a/lib/private/Files/Cache/Wrapper/CacheJail.php
+++ b/lib/private/Files/Cache/Wrapper/CacheJail.php
@@ -312,6 +312,10 @@ class CacheJail extends CacheWrapper {
*/
public function getPathById($id) {
$path = $this->getCache()->getPathById($id);
+ if ($path === null) {
+ return null;
+ }
+
return $this->getJailedPath($path);
}