wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #4789: Group admins cannot see disabled users

Browse source
This commit is contained in:
Neraste 2017-11-27 00:16:54 +01:00
parent 63d98574e9
commit 2622dda8c2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
settings/Controller/UsersController.php
View file

@ -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);