diff options
| author | goodkiller <markopraakli@gmail.com> | 2014-10-14 01:18:45 +0300 |
|---|---|---|
| committer | goodkiller <markopraakli@gmail.com> | 2014-10-14 01:18:45 +0300 |
| commit | 9f0b99cd17376c8a7a87da81431a4818f6ee41b3 (patch) | |
| tree | cd2e86e938306e5e6bc0b847f0a7b72c83612e7a /lib/private | |
| parent | baffe5353f3fd57fd9ecb353ae81bf3164896f6f (diff) | |
| download | nextcloud-server-9f0b99cd17376c8a7a87da81431a4818f6ee41b3.tar.gz nextcloud-server-9f0b99cd17376c8a7a87da81431a4818f6ee41b3.zip | |
Update group.php
Here is fox for my LDAP users OW 7.0.2
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 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; |