Merge pull request #44279 from nextcloud/sort-submount-view

fix: ensure nested mount points are handled in the correct order

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 36d7002a269..5ad48e26cc5 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -1481,6 +1481,13 @@ class View {
 
 		//add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders
 		$mounts = Filesystem::getMountManager()->findIn($path);
+
+		// make sure nested mounts are sorted after their parent mounts
+		// otherwise doesn't propagate the etag across storage boundaries correctly
+		usort($mounts, function (IMountPoint $a, IMountPoint $b) {
+			return $a->getMountPoint() <=> $b->getMountPoint();
+		});
+
 		$dirLength = strlen($path);
 		foreach ($mounts as $mount) {
 			$mountPoint = $mount->getMountPoint();