From 7be031ae6de807862d7d9e3632c79f8b80cf73c9 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 12 Sep 2016 16:16:20 +0200 Subject: change group id to _disabledUsers --- settings/Controller/UsersController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'settings/Controller') diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php index 5949d9c9746..293afe9e6ff 100644 --- a/settings/Controller/UsersController.php +++ b/settings/Controller/UsersController.php @@ -268,15 +268,15 @@ class UsersController extends Controller { $users = []; if ($this->isAdmin) { - if($gid !== '' && $gid !== 'disabledUsers') { + if($gid !== '' && $gid !== '_disabledUsers') { $batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset)); } else { $batch = $this->userManager->search($pattern, $limit, $offset); } foreach ($batch as $user) { - if( ($gid !== 'disabledUsers' && $user->isEnabled()) || - ($gid === 'disabledUsers' && !$user->isEnabled()) + if( ($gid !== '_disabledUsers' && $user->isEnabled()) || + ($gid === '_disabledUsers' && !$user->isEnabled()) ) { $users[] = $this->formatUserForIndex($user); } @@ -292,7 +292,7 @@ class UsersController extends Controller { $subAdminOfGroups = $gids; // Set the $gid parameter to an empty value if the subadmin has no rights to access a specific group - if($gid !== '' && $gid !== 'disabledUsers' && !in_array($gid, $subAdminOfGroups)) { + if($gid !== '' && $gid !== '_disabledUsers' && !in_array($gid, $subAdminOfGroups)) { $gid = ''; } @@ -317,8 +317,8 @@ class UsersController extends Controller { $this->groupManager->getUserGroupIds($user), $subAdminOfGroups )); - if( ($gid !== 'disabledUsers' && $user->isEnabled()) || - ($gid === 'disabledUsers' && !$user->isEnabled()) + if( ($gid !== '_disabledUsers' && $user->isEnabled()) || + ($gid === '_disabledUsers' && !$user->isEnabled()) ) { $users[] = $this->formatUserForIndex($user, $userGroups); } -- cgit v1.2.3