From c8f9efeb94b136ed0906cefe946629a091796ff2 Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon, 16 Sep 2013 23:32:17 +0200
Subject: etag changes are now propagated up the file tree

---
 lib/files/cache/scanner.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'lib')

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 78cab6ed2da..fdbce0d51fe 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -99,8 +99,10 @@ class Scanner extends BasicEmitter {
 				if ($reuseExisting and $cacheData = $this->cache->get($file)) {
 					// prevent empty etag
 					$etag = $cacheData['etag'];
+					$propagateETagChange = false;
 					if (empty($etag)) {
 						$etag = $data['etag'];
+						$propagateETagChange = true;
 					}
 
 					// only reuse data if the file hasn't explicitly changed
@@ -110,6 +112,18 @@ class Scanner extends BasicEmitter {
 						}
 						if ($reuseExisting & self::REUSE_ETAG) {
 							$data['etag'] = $etag;
+							if ($propagateETagChange) {
+								$parent = $file;
+								while ($parent !== '') {
+									$parent = dirname($parent);
+									if ($parent === '.') {
+										$parent = '';
+									}
+									$parentCacheData = $this->cache->get($parent);
+									$parentCacheData['etag'] = $this->storage->getETag($parent);
+									$this->cache->put($parent, $parentCacheData);
+								}
+							}
 						}
 					}
 					// Only update metadata that has changed
-- 
cgit v1.2.3