upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Merge pull request #11555 from goodkiller/patch-1

Browse source 
Update group.php
This commit is contained in:
Joas Schilling 2015-02-24 13:58:41 +01:00
commit 88cfe46906
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/private/group.php
View file

@ -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;