diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-16 11:32:17 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-16 11:32:17 +0100 |
| commit | 78febb2ee594bac5d483f7c8534ed5eb33c2c528 (patch) | |
| tree | 12029a3df4ff94baed341ff99e809c2551904034 /lib/private | |
| parent | 09a33b11a4823f050c8fa44b75462affe4801270 (diff) | |
| parent | 6ecfcde954f65a69641da7beaa3d9008924a7bc3 (diff) | |
| download | nextcloud-server-78febb2ee594bac5d483f7c8534ed5eb33c2c528.tar.gz nextcloud-server-78febb2ee594bac5d483f7c8534ed5eb33c2c528.zip | |
Merge pull request #14201 from owncloud/propagator-dont-decrease-mtime
Dont lower the mtime of a folder when propagating changes
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/files/cache/changepropagator.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/files/cache/changepropagator.php b/lib/private/files/cache/changepropagator.php index 2967c8f6259..36fc6e80144 100644 --- a/lib/private/files/cache/changepropagator.php +++ b/lib/private/files/cache/changepropagator.php @@ -59,8 +59,8 @@ class ChangePropagator { list($storage, $internalPath) = $this->view->resolvePath($parent); if ($storage) { $cache = $storage->getCache(); - $id = $cache->getId($internalPath); - $cache->update($id, array('mtime' => $time, 'etag' => $storage->getETag($internalPath))); + $entry = $cache->get($internalPath); + $cache->update($entry['fileid'], array('mtime' => max($time, $entry['mtime']), 'etag' => $storage->getETag($internalPath))); } } } |