Merge pull request #8889 from owncloud/mtime-reuse

Don't update the mtime if the storage mtime hasn't changed

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index 0c59e57d839..965013c5c98 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -121,6 +121,7 @@ class Scanner extends BasicEmitter {
 						}
 						// only reuse data if the file hasn't explicitly changed
 						if (isset($data['storage_mtime']) && isset($cacheData['storage_mtime']) && $data['storage_mtime'] === $cacheData['storage_mtime']) {
+							$data['mtime'] = $cacheData['mtime'];
 							if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) {
 								$data['size'] = $cacheData['size'];
 							}
diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php
index 159a2a48677..5e5cc6ac128 100644
--- a/tests/lib/files/utils/scanner.php
+++ b/tests/lib/files/utils/scanner.php
@@ -112,7 +112,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(array('/foo', '/foo/folder', '/foo/folder/bar.txt', '/foo/foo.txt'), $changes);
 		$this->assertEquals(array('/', '/foo', '/foo/folder'), $parents);
 
-		$cache->put('foo.txt', array('mtime' => time() - 50));
+		$cache->put('foo.txt', array('storage_mtime' => time() - 50));
 
 		$propagator = $this->getMock('\OC\Files\Cache\ChangePropagator', array('propagateChanges'), array(), '', false);
 		$scanner->setPropagator($propagator);
@@ -128,7 +128,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 		$scanner->setPropagator($originalPropagator);
 
 		$oldInfo = $cache->get('');
-		$cache->put('foo.txt', array('mtime' => time() - 70));
+		$cache->put('foo.txt', array('storage_mtime' => time() - 70));
 		$storage->file_put_contents('foo.txt', 'asdasd');
 
 		$scanner->scan('');