diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/files/cache/scanner.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index cd022d25132..8f9a7921956 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -78,19 +78,15 @@ class Scanner { $this->scanFile($parent); } } + $newData = $data; if ($cacheData = $this->cache->get($file)) { + if ($checkExisting && $data['size'] === -1) { + $data['size'] = $cacheData['size']; + } if ($data['mtime'] === $cacheData['mtime'] && $data['size'] === $cacheData['size']) { $data['etag'] = $cacheData['etag']; } - } - if ($checkExisting and $cacheData) { - if ($data['size'] === -1) { - $data['size'] = $cacheData['size']; - } - } - $newData = $data; - if ($cacheData) { // Only update metadata that has changed $newData = array_diff($data, $cacheData); } |