summaryrefslogtreecommitdiffstats
path: root/lib/private/group.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/group.php')
-rw-r--r--lib/private/group.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/group.php b/lib/private/group.php
index 49f683c411a..010c614bf91 100644
--- 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;