Merge pull request #11555 from goodkiller/patch-1

Update group.php
2015-02-24 13:58:41 +01:00 · 2015-02-24 13:58:41 +01:00 · 88cfe46906
parent 276824299c 9f0b99cd17
commit 88cfe46906
1 changed files with 2 additions and 1 deletions
--- a/lib/private/group.php
+++ b/lib/private/group.php
@ -277,7 +277,8 @@ class OC_Group {
 				$displayNames
 			);
 			if ($diff) {
-				$displayNames = array_merge($diff, $displayNames);
+				// A fix for LDAP users. array_merge loses keys...
+				$displayNames = $diff + $displayNames;
 			}
 		}
 		return $displayNames;