diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/cache/scanner.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index 79159724d16..c0bdde06a75 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -115,11 +115,12 @@ class Scanner extends BasicEmitter { } if ($reuseExisting) { // prevent empty etag - $etag = $cacheData['etag']; - $propagateETagChange = false; - if (empty($etag)) { + if (empty($cacheData['etag'])) { $etag = $data['etag']; $propagateETagChange = true; + } else { + $etag = $cacheData['etag']; + $propagateETagChange = false; } // only reuse data if the file hasn't explicitly changed if (isset($data['storage_mtime']) && isset($cacheData['storage_mtime']) && $data['storage_mtime'] === $cacheData['storage_mtime']) { |