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 /lib/private/user | |
| 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 'lib/private/user')
| -rw-r--r-- | lib/private/user/manager.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php index 14698452e88..6f6fd80a8ef 100644 --- a/lib/private/user/manager.php +++ b/lib/private/user/manager.php @@ -174,12 +174,12 @@ class Manager extends PublicEmitter { $backendUsers = $backend->getUsers($pattern, $limit, $offset); if (is_array($backendUsers)) { foreach ($backendUsers as $uid) { - $users[] = $this->getUserObject($uid, $backend); + $users[$uid] = $this->getUserObject($uid, $backend); } } } - usort($users, function ($a, $b) { + uasort($users, function ($a, $b) { /** * @var \OC\User\User $a * @var \OC\User\User $b |