summaryrefslogtreecommitdiffstats
path: root/lib/private/Files
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-11-20 09:51:18 +0100
committerGitHub <noreply@github.com>2018-11-20 09:51:18 +0100
commitcc6c30e7695eb04df3660a386350292a568c4d26 (patch)
tree39529c96563e4618fcf7816ff92cfb30354412b2 /lib/private/Files
parent8e65f08617d77d29280e9a5ab1d6d8a2fed75f36 (diff)
parentaa6f7947bacbf8eeb7eae4f5db7c0a52d7b4bbfa (diff)
downloadnextcloud-server-cc6c30e7695eb04df3660a386350292a568c4d26.tar.gz
nextcloud-server-cc6c30e7695eb04df3660a386350292a568c4d26.zip
Merge pull request #12494 from nextcloud/cache-notfound-id
return the correct value when trying to get a non existing item from cache by id
Diffstat (limited to 'lib/private/Files')
-rw-r--r--lib/private/Files/Cache/Cache.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
index 1cb11c70a40..43e48e51654 100644
--- a/lib/private/Files/Cache/Cache.php
+++ b/lib/private/Files/Cache/Cache.php
@@ -150,6 +150,8 @@ class Cache implements ICache {
$data = $this->partial[$file];
}
return $data;
+ } else if (!$data) {
+ return $data;
} else {
return self::cacheEntryFromData($data, $this->mimetypeLoader);
}