diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-02-24 13:58:41 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-24 13:58:41 +0100 |
| commit | 88cfe469062bd01cad3132acbeea1cc3428f3e32 (patch) | |
| tree | 0957442e835d2e6bbc58dc920587c42e8f6e09e6 /lib/private | |
| parent | 276824299ce05250f497075b3153148a3040bdf3 (diff) | |
| parent | 9f0b99cd17376c8a7a87da81431a4818f6ee41b3 (diff) | |
| download | nextcloud-server-88cfe469062bd01cad3132acbeea1cc3428f3e32.tar.gz nextcloud-server-88cfe469062bd01cad3132acbeea1cc3428f3e32.zip | |
Merge pull request #11555 from goodkiller/patch-1
Update group.php
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/group.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/group.php b/lib/private/group.php index 85632248d24..c6846e27581 100644 --- a/lib/private/group.php +++ b/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; |