Update group.php

Here is fox for my LDAP users OW 7.0.2
2014-10-14 01:18:45 +03:00 · 2014-10-14 01:18:45 +03:00 · 9f0b99cd17
parent baffe5353f
commit 9f0b99cd17
1 changed files with 2 additions and 1 deletions
--- a/lib/private/group.php
+++ b/lib/private/group.php
@ -282,7 +282,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;