diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2013-04-30 19:51:28 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2013-05-03 13:50:14 +0200 |
| commit | 9c3b83e28c8a10f9ad38d3487dae1a3bc9601635 (patch) | |
| tree | 526ee78103c8fee67ac24fc366f92a62228a169e /settings/ajax | |
| parent | 4f6565d8e7479ed637cc5e418e7dc768a54c4b0a (diff) | |
| download | nextcloud-server-9c3b83e28c8a10f9ad38d3487dae1a3bc9601635.tar.gz nextcloud-server-9c3b83e28c8a10f9ad38d3487dae1a3bc9601635.zip | |
Fix retrieval of users with multiple backends
Diffstat (limited to 'settings/ajax')
| -rw-r--r-- | settings/ajax/userlist.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php index 87b42395749..4abf54b8987 100644 --- a/settings/ajax/userlist.php +++ b/settings/ajax/userlist.php @@ -27,9 +27,14 @@ if (isset($_GET['offset'])) { } else { $offset = 0; } +if (isset($_GET['limit'])) { + $limit = $_GET['limit']; +} else { + $limit = 10; +} $users = array(); if (OC_User::isAdminUser(OC_User::getUser())) { - $batch = OC_User::getDisplayNames('', 10, $offset); + $batch = OC_User::getDisplayNames('', $limit, $offset); foreach ($batch as $user => $displayname) { $users[] = array( 'name' => $user, @@ -40,7 +45,7 @@ if (OC_User::isAdminUser(OC_User::getUser())) { } } else { $groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()); - $batch = OC_Group::usersInGroups($groups, '', 10, $offset); + $batch = OC_Group::usersInGroups($groups, '', $limit, $offset); foreach ($batch as $user) { $users[] = array( 'name' => $user, |