From 308891f9bd84afa23de2b54ccfbcbe84364a62d1 Mon Sep 17 00:00:00 2001 From: Neraste Date: Mon, 27 Nov 2017 00:16:54 +0100 Subject: [PATCH] Fix #4789: Group admins cannot see disabled users Signed-off-by: Arthur Schiwon --- settings/Controller/UsersController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php index 36ac263b8cd..fc0aa4118aa 100644 --- a/settings/Controller/UsersController.php +++ b/settings/Controller/UsersController.php @@ -302,7 +302,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); @@ -310,8 +312,6 @@ class UsersController extends Controller { $batch[$uid] = $displayName; } } - } else { - $batch = $this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset); } $batch = $this->getUsersForUID($batch); -- 2.39.5