summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-02-12 16:48:21 +0100
committerRobin Appelman <icewind@owncloud.com>2013-02-12 16:48:21 +0100
commitb54dcd1999b0ce447dc6920ac8cd361095b8346d (patch)
tree0c432802d5baa9a78448dc20d77e797d02c19531 /lib
parentf2baf1ae0eb7f5cd34773b05de2e286eab2cd0a1 (diff)
downloadnextcloud-server-b54dcd1999b0ce447dc6920ac8cd361095b8346d.tar.gz
nextcloud-server-b54dcd1999b0ce447dc6920ac8cd361095b8346d.zip
Cache: fix scanner trying to use existing data when file isn't in cache
Diffstat (limited to 'lib')
-rw-r--r--lib/files/cache/scanner.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 9f72e206147..88f208547f6 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -74,8 +74,7 @@ class Scanner {
$this->scanFile($parent);
}
}
- if ($checkExisting) {
- $cacheData = $this->cache->get($file);
+ if ($checkExisting and $cacheData = $this->cache->get($file)) {
if ($data['size'] === -1) {
$data['size'] = $cacheData['size'];
}