Fix #4789: Group admins cannot see disabled users

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index 36ac263b8cd83900ab958d69d1e1fc318ee8db12..fc0aa4118aa97834aeede48a3c4a17a8e6118a63 100644 (file)
--- 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);