aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2015-02-13 14:30:05 +0100
committerRobin Appelman <icewind@owncloud.com>2015-02-13 14:30:05 +0100
commit134243d3e5a78b51f20ac0816d462c1de8e121c8 (patch)
treec30d8c09e9c930d7f102ba3759cbb79d5b23afaa /lib
parent139356396588e596de10d9816e4d26901d923b8b (diff)
downloadnextcloud-server-134243d3e5a78b51f20ac0816d462c1de8e121c8.tar.gz
nextcloud-server-134243d3e5a78b51f20ac0816d462c1de8e121c8.zip
Dont lower the mtime of a folder when propagating changes
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/cache/changepropagator.php4
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)));
}
}
}