diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-02-22 07:44:24 -0800 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-02-22 07:44:24 -0800 |
| commit | 78fce834058a38a7dbcc5310e16095c743434bc6 (patch) | |
| tree | ebb75151439a10ed4d17513e4bdd199e2dfa88d7 /settings/ajax | |
| parent | 608ebb59ddab462383fb156189989da6290e04c9 (diff) | |
| parent | 2268596e1a3cb305bc3092394e59d5fdc72f0c1b (diff) | |
| download | nextcloud-server-78fce834058a38a7dbcc5310e16095c743434bc6.tar.gz nextcloud-server-78fce834058a38a7dbcc5310e16095c743434bc6.zip | |
Merge pull request #1855 from owncloud/userlist_load_displaynames
Fetch displayname in userlist ajax requests. Refs #1681
Diffstat (limited to 'settings/ajax')
| -rw-r--r-- | settings/ajax/userlist.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php index 9bbff80ea0c..5282f4a7143 100644 --- a/settings/ajax/userlist.php +++ b/settings/ajax/userlist.php @@ -29,10 +29,11 @@ if (isset($_GET['offset'])) { } $users = array(); if (OC_User::isAdminUser(OC_User::getUser())) { - $batch = OC_User::getUsers('', 10, $offset); - foreach ($batch as $user) { + $batch = OC_User::getDisplayNames('', 10, $offset); + foreach ($batch as $user => $displayname) { $users[] = array( 'name' => $user, + 'displayname' => $displayname, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default')); @@ -43,6 +44,7 @@ if (OC_User::isAdminUser(OC_User::getUser())) { foreach ($batch as $user) { $users[] = array( 'name' => $user, + 'displayname' => OC_User::determineDisplayName($user), 'groups' => join(', ', OC_Group::getUserGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default')); } |