Commit 88cfe469 authored by Joas Schilling's avatar Joas Schilling
Browse files

Merge pull request #11555 from goodkiller/patch-1

Update group.php
parents 27682429 9f0b99cd
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment