diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-01-15 01:31:33 -0800 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-01-15 01:31:33 -0800 |
| commit | 34559ef11428c9a2a1b83f8a63d650d1fa0be49e (patch) | |
| tree | cfc4f03bdb4aa479717159779bd0fc418437fd8f /lib/private/files/cache | |
| parent | 25fecb4f25ce5d229a075046a5a985f22dc7f830 (diff) | |
| parent | 16b898ddb8bed50dca57472526d56a87a3b19c94 (diff) | |
| download | nextcloud-server-34559ef11428c9a2a1b83f8a63d650d1fa0be49e.tar.gz nextcloud-server-34559ef11428c9a2a1b83f8a63d650d1fa0be49e.zip | |
Merge pull request #6768 from owncloud/scanner-use-storage-mtime
Use storage_mtime when determining if we can reuse cached data while scanning
Diffstat (limited to 'lib/private/files/cache')
| -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']; } |