diff options
| author | blizzz <blizzz@owncloud.com> | 2014-04-23 16:30:26 +0200 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2014-04-23 16:30:26 +0200 |
| commit | 14c95086a98e2a2543b7d1eefe30508a3d3a4126 (patch) | |
| tree | d228dd638b333ee0d24fa05c04b0f392b4e8fe3d /lib/private/group/group.php | |
| parent | 4696b06060b8dd43e1465d675aaa71b80afcc5f9 (diff) | |
| parent | 0a9487ec801c640bfdb59c037b4ca3f4ea95fe0a (diff) | |
| download | nextcloud-server-14c95086a98e2a2543b7d1eefe30508a3d3a4126.tar.gz nextcloud-server-14c95086a98e2a2543b7d1eefe30508a3d3a4126.zip | |
Merge pull request #7745 from owncloud/fix_6946_stable6
Group Database backend must not gather user details itself but ask user backends, fixes #6946 in stable6
Diffstat (limited to 'lib/private/group/group.php')
| -rw-r--r-- | lib/private/group/group.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/private/group/group.php b/lib/private/group/group.php index d5a17f6d215..ae8eeacb23a 100644 --- a/lib/private/group/group.php +++ b/lib/private/group/group.php @@ -180,11 +180,7 @@ class Group { */ public function searchDisplayName($search, $limit = null, $offset = null) { foreach ($this->backends as $backend) { - if ($backend->implementsActions(OC_GROUP_BACKEND_GET_DISPLAYNAME)) { - $userIds = array_keys($backend->displayNamesInGroup($this->gid, $search, $limit, $offset)); - } else { - $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset); - } + $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset); $users = $this->getVerifiedUsers($userIds); if (!is_null($limit) and $limit <= 0) { return array_values($users); |