From 7330fcf5e81e7d91ed37f01da7cc45833e10f1c4 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 22 Jan 2013 20:57:15 +0100
Subject: Cache: make mounts overwrite existing folders, prevents duplicate
 entries

---
 lib/files/view.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib/files/view.php')

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;
 						}
 					}
-- 
cgit v1.2.3