Cache: also preserve etags for files

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 7f19261d972761d870d8b18b2783b735892adc4d..70266c26e68d3d4873ba09960619fc9408db7ecc 100644 (file)
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -74,8 +74,11 @@ class Scanner {
                                        $this->scanFile($parent);
                                }
                        }
-                       if ($checkExisting and $data['size'] === -1 and $cacheData = $this->cache->get($file)) {
-                               $data['size'] = $cacheData['size'];
+                       if ($checkExisting) {
+                               $cacheData = $this->cache->get($file)
+                               if ($data['size'] === -1) {
+                                       $data['size'] = $cacheData['size'];
+                               }
                                if ($data['mtime'] === $cacheData['mtime']) {
                                        $data['etag'] = $cacheData['etag'];
                                }