From 134243d3e5a78b51f20ac0816d462c1de8e121c8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 13 Feb 2015 14:30:05 +0100
Subject: Dont lower the mtime of a folder when propagating changes

---
 lib/private/files/cache/changepropagator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/private')

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)));
 			}
 		}
 	}
-- 
cgit v1.2.3