sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #4789: Group admins cannot see disabled users 

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
pull/8006/head
Neraste 2017-11-27 00:16:54 +07:00 committed by Arthur Schiwon
parent 74ee895cc7
commit 308891f9bd
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
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
Unescape Escape View File

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