aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/private/Files/Cache/Cache.php2
-rw-r--r--tests/lib/Files/Cache/CacheTest.php1
2 files changed, 3 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);
}
diff --git a/tests/lib/Files/Cache/CacheTest.php b/tests/lib/Files/Cache/CacheTest.php
index bc95a9004f8..d984964ca9f 100644
--- a/tests/lib/Files/Cache/CacheTest.php
+++ b/tests/lib/Files/Cache/CacheTest.php
@@ -553,6 +553,7 @@ class CacheTest extends \Test\TestCase {
function testNonExisting() {
$this->assertFalse($this->cache->get('foo.txt'));
+ $this->assertFalse($this->cache->get(-1));
$this->assertEquals(array(), $this->cache->getFolderContents('foo'));
}