Merge pull request #11555 from goodkiller/patch-1

Update group.php

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;