diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-01-17 14:47:29 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-01-17 14:47:29 +0100 |
| commit | 5cb08bb9cb6cf603d47a124ffa0ea60881f7de51 (patch) | |
| tree | 89ac0ff4115dc175cb79b35b4df837dab3f7df45 /lib/private/files | |
| parent | 299bb4d99db935bb529a30fe6ae0c9bc72344d69 (diff) | |
| parent | db353e14cce316b271d3bfcfdbc6989e146d4517 (diff) | |
| download | nextcloud-server-5cb08bb9cb6cf603d47a124ffa0ea60881f7de51.tar.gz nextcloud-server-5cb08bb9cb6cf603d47a124ffa0ea60881f7de51.zip | |
Merge branch 'master' into fileinfo
Conflicts:
tests/lib/files/cache/cache.php
Diffstat (limited to 'lib/private/files')
| -rw-r--r-- | lib/private/files/cache/scanner.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index a8c069ee99f..92a4c01841b 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -122,7 +122,7 @@ class Scanner extends BasicEmitter { $propagateETagChange = true; } // only reuse data if the file hasn't explicitly changed - if (isset($data['mtime']) && isset($cacheData['mtime']) && $data['mtime'] === $cacheData['mtime']) { + if (isset($data['storage_mtime']) && isset($cacheData['storage_mtime']) && $data['storage_mtime'] === $cacheData['storage_mtime']) { if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) { $data['size'] = $cacheData['size']; } |