diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-08-14 20:56:44 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-14 20:56:44 +0200 |
| commit | 4b5fb08c2cda4a13a1b81699f308d21b89f1723b (patch) | |
| tree | a1f40bb6c6bcaf4e9093c2153d0a32fefecf2b79 /lib/files/cache/scanner.php | |
| parent | e5761d90ef223a04205ad93eea7706439ef0b60e (diff) | |
| parent | 994537a5b94826294e61231768f27964bc736ced (diff) | |
| download | nextcloud-server-4b5fb08c2cda4a13a1b81699f308d21b89f1723b.tar.gz nextcloud-server-4b5fb08c2cda4a13a1b81699f308d21b89f1723b.zip | |
Merge master into oc_preview
Diffstat (limited to 'lib/files/cache/scanner.php')
| -rw-r--r-- | lib/files/cache/scanner.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index dd212d84cc5..597eabecf54 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -98,7 +98,7 @@ class Scanner extends BasicEmitter { $newData = $data; if ($reuseExisting and $cacheData = $this->cache->get($file)) { // only reuse data if the file hasn't explicitly changed - if ($data['mtime'] === $cacheData['mtime']) { + if (isset($data['mtime']) && isset($cacheData['mtime']) && $data['mtime'] === $cacheData['mtime']) { if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) { $data['size'] = $cacheData['size']; } @@ -184,7 +184,7 @@ class Scanner extends BasicEmitter { } \OC_DB::commit(); foreach ($childQueue as $child) { - $childSize = $this->scanChildren($child, self::SCAN_RECURSIVE); + $childSize = $this->scanChildren($child, self::SCAN_RECURSIVE, $reuse); if ($childSize === -1) { $size = -1; } else { |