diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-06-08 11:22:01 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-06-08 11:22:01 +0200 |
| commit | c5a6c8b70bbe15de631a472370c783885a943f72 (patch) | |
| tree | dc9b0d9902954765449aed05973019c1ddee9f51 /apps/user_ldap | |
| parent | 7dcc47dc94c2db2e1968b9a5bdcab694d1b78dbb (diff) | |
| download | nextcloud-server-c5a6c8b70bbe15de631a472370c783885a943f72.tar.gz nextcloud-server-c5a6c8b70bbe15de631a472370c783885a943f72.zip | |
Use array_merge when reading cached groups members
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/lib/Group_LDAP.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index 7c12613f34d..14d86fb0619 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -535,7 +535,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); |