diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-06-08 12:22:01 +0300 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-06-08 12:24:22 +0300 |
| commit | b37f2e230b0ca8aa4498567b40e5b465240586ff (patch) | |
| tree | 3b230844845fcdce280689b37e88180c156f98bd /apps | |
| parent | 087f005936ff5acfa58a874579aa235d86222945 (diff) | |
Use array_merge when reading cached groups members
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/user_ldap/group_ldap.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 63476525dfa..f87fe1b5cab 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -531,7 +531,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { } if(isset($this->cachedGroupsByMember[$uid])) { - $groups[] = $this->cachedGroupsByMember[$uid]; + $groups = array_merge($groups, $this->cachedGroupsByMember[$uid]); } else { $groupsByMember = array_values($this->getGroupsByMember($uid)); $groupsByMember = $this->access->ownCloudGroupNames($groupsByMember); |