diff options
| author | Neraste <neraste.herr10@gmail.com> | 2017-11-27 00:16:54 +0100 |
|---|---|---|
| committer | Neraste <neraste.herr10@gmail.com> | 2017-11-27 00:16:54 +0100 |
| commit | 2622dda8c23b0b0f1a9da61797dae9588ff99b07 (patch) | |
| tree | b85104354ed45ad9c56a9e65feac9484248e22cb /settings/Controller | |
| parent | 63d98574e983116e20b056af223683efde8fb4de (diff) | |
| download | nextcloud-server-2622dda8c23b0b0f1a9da61797dae9588ff99b07.tar.gz nextcloud-server-2622dda8c23b0b0f1a9da61797dae9588ff99b07.zip | |
Fix #4789: Group admins cannot see disabled users
Diffstat (limited to 'settings/Controller')
| -rw-r--r-- | settings/Controller/UsersController.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php index 68c920dde17..53ffd62a06d 100644 --- a/settings/Controller/UsersController.php +++ b/settings/Controller/UsersController.php @@ -339,7 +339,9 @@ class UsersController extends Controller { // Batch all groups the user is subadmin of when a group is specified $batch = []; - if ($gid === '') { + if ($gid !== '' && $gid !== '_disabledUsers' && $gid !== '_everyone') { + $batch = $this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset); + } else { foreach ($subAdminOfGroups as $group) { $groupUsers = $this->groupManager->displayNamesInGroup($group, $pattern, $limit, $offset); @@ -347,8 +349,6 @@ class UsersController extends Controller { $batch[$uid] = $displayName; } } - } else { - $batch = $this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset); } $batch = $this->getUsersForUID($batch); |