diff options
author | Arthur Schiwon <blizzz@owncloud.com> | 2014-03-14 13:51:17 +0100 |
---|---|---|
committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-04-28 13:49:56 +0200 |
commit | 45e42c25de5e498197a9aace7161b4f377a8dacc (patch) | |
tree | f08d13bc5b8d561659fd6ca50ee70bae640c4956 /apps/user_ldap/group_proxy.php | |
parent | e27dc5b6f9acd7e8758da66013dd012540618b74 (diff) | |
download | nextcloud-server-45e42c25de5e498197a9aace7161b4f377a8dacc.tar.gz nextcloud-server-45e42c25de5e498197a9aace7161b4f377a8dacc.zip |
Group Database backend must not gather user details itself but ask user
backends. This is a port to master from PR #7745
remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends
Conflicts:
lib/private/group/backend.php
LDAP: getDisplayNamesInGroup is not an option for group backends anymore
Conflicts:
apps/user_ldap/group_ldap.php
apps/user_ldap/group_proxy.php
clean up group backends
Conflicts:
lib/private/group/database.php
remove now unnecessary test
implement getDisplayNames in group manager
adjust user manager tests
test for group manager's displayNamesInGroup
trim must not be used in empty in PHP < 5.5
keep the constant to not provoke PHP warnings
Conflicts:
lib/private/group/backend.php
Diffstat (limited to 'apps/user_ldap/group_proxy.php')
-rw-r--r-- | apps/user_ldap/group_proxy.php | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/apps/user_ldap/group_proxy.php b/apps/user_ldap/group_proxy.php index c0009736239..ea94990ffe4 100644 --- a/apps/user_ldap/group_proxy.php +++ b/apps/user_ldap/group_proxy.php @@ -156,22 +156,6 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface { } /** - * @brief get a list of all display names in a group - * @returns array with display names (value) and user ids(key) - */ - public function displayNamesInGroup($gid, $search, $limit, $offset) { - $displayNames = array(); - - foreach($this->backends as $backend) { - $backendUsers = $backend->displayNamesInGroup($gid, $search, $limit, $offset); - if (is_array($backendUsers)) { - $displayNames = array_merge($displayNames, $backendUsers); - } - } - return $displayNames; - } - - /** * @brief get a list of all groups * @returns array with group names * |