Cache: make mounts overwrite existing folders, prevents duplicate entries

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/files/view.php b/lib/files/view.php
index 06027910123..c50897603eb 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -794,6 +794,14 @@ class View {
 								$subPermissionsCache->set($rootEntry['fileid'], $user, $permissions);
 							}
 							$rootEntry['permissions'] = $permissions;
+
+							//remove any existing entry with the same name
+							foreach ($files as $i => $file) {
+								if ($file['name'] === $rootEntry['name']) {
+									unset($files[$i]);
+									break;
+								}
+							}
 							$files[] = $rootEntry;
 						}
 					}