Fix #4789: Group admins cannot see disabled users
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
parent
74ee895cc7
commit
308891f9bd
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in New Issue