From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 12 Feb 2013 13:56:57 +0000 (+0100)
Subject: Cache: also preserve etags for files
X-Git-Tag: v5.0.0alpha1~5^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e1fe5279ddd848b1ee367184c2c6ba7c763bd4a7;p=nextcloud-server.git

Cache: also preserve etags for files
---

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 7f19261d972..70266c26e68 100644
--- 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'];
 				}