diff options
author | Robin Appelman <icewind@owncloud.com> | 2013-02-12 14:56:57 +0100 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2013-02-12 14:56:57 +0100 |
commit | e1fe5279ddd848b1ee367184c2c6ba7c763bd4a7 (patch) | |
tree | caf3c18f26edbb0e290415733b644408359693d7 /lib | |
parent | 2921d2fb785f265bb3bf17873ada304145d49aec (diff) | |
download | nextcloud-server-e1fe5279ddd848b1ee367184c2c6ba7c763bd4a7.tar.gz nextcloud-server-e1fe5279ddd848b1ee367184c2c6ba7c763bd4a7.zip |
Cache: also preserve etags for files
Diffstat (limited to 'lib')
-rw-r--r-- | lib/files/cache/scanner.php | 7 |
1 files changed, 5 insertions, 2 deletions
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']; } |