Merge pull request #7168 from nextcloud/fix-user-list

Fix accesslist when a user has an ID only containting 0-9
nextcloud · Nov 23, 2017 · 98cdd98 · 98cdd98
2 parents 106d932 + 3820d68
commit 98cdd98
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
@@ -1390,7 +1390,7 @@ public function getAccessList(\OCP\Files\Node $path, $recursive = true, $current
 			foreach ($tmp as $k => $v) {
 				if (isset($al[$k])) {
 					if (is_array($al[$k])) {
-						$al[$k] = array_merge($al[$k], $v);
+						$al[$k] += $v;
 					} else {
 						$al[$k] = $al[$k] || $v;
 					}