take the etag of child mounts into account for the folder etag

this replaces shared etag propagation

1 files changed, 11 insertions, 5 deletions

diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 40477243324..e6110c1925d 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -160,6 +160,7 @@ class Cache {
 		} else {
 			//fix types
 			$data['fileid'] = (int)$data['fileid'];
+			$data['parent'] = (int)$data['parent'];
 			$data['size'] = 0 + $data['size'];
 			$data['mtime'] = (int)$data['mtime'];
 			$data['storage_mtime'] = (int)$data['storage_mtime'];
@@ -391,12 +392,17 @@ class Cache {
 		if ($file === '') {
 			return -1;
 		} else {
-			$parent = dirname($file);
-			if ($parent === '.') {
-				$parent = '';
-			}
-			return $this->getId($parent);
+			$parent = $this->getParentPath($file);
+			return (int) $this->getId($parent);
+		}
+	}
+
+	private function getParentPath($path) {
+		$parent = dirname($path);
+		if ($parent === '.') {
+			$parent = '';
 		}
+		return $parent;
 	}
 
 	/**