Cache: Do not overwrite ETag when file did not change

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 88f208547f6162c6c4a5e279c3ebc6288cd65cf6..f0b86beb280ac78ddfda0bc74cdfa4fafd00afaa 100644 (file)
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -74,14 +74,16 @@ class Scanner {
                                        $this->scanFile($parent);
                                }
                        }
-                       if ($checkExisting and $cacheData = $this->cache->get($file)) {
-                               if ($data['size'] === -1) {
-                                       $data['size'] = $cacheData['size'];
-                               }
+                       if($cacheData = $this->cache->get($file)) {
                                if ($data['mtime'] === $cacheData['mtime']) {
                                        $data['etag'] = $cacheData['etag'];
                                }
                        }
+                       if ($checkExisting and $cacheData) {
+                               if ($data['size'] === -1) {
+                                       $data['size'] = $cacheData['size'];
+                               }
+                       }
                        $this->cache->put($file, $data);
                }
                return $data;