Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-07-29 08:15:55 +02:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

Merge pull request #7292 from Neraste/fix/4789_disabled_users

Browse Source 
Fix #4789: Group admins cannot see disabled users
This commit is contained in:
Lukas Reschke 2017-11-27 17:29:59 +01:00 committed by GitHub
commit 4d200851f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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);