diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-11-27 17:29:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 17:29:59 +0100 |
| commit | 4d200851f9fd54d563bfab090d26d8ebfb163955 (patch) | |
| tree | 474186b09533b853df4b244c7104b8294d27fb42 /settings | |
| parent | 573551253ed800d9e75d784a96f71d4d327bd95e (diff) | |
| parent | 2622dda8c23b0b0f1a9da61797dae9588ff99b07 (diff) | |
| download | nextcloud-server-4d200851f9fd54d563bfab090d26d8ebfb163955.tar.gz nextcloud-server-4d200851f9fd54d563bfab090d26d8ebfb163955.zip | |
Merge pull request #7292 from Neraste/fix/4789_disabled_users
Fix #4789: Group admins cannot see disabled users
Diffstat (limited to 'settings')
| -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); |