summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-11-14 23:30:02 +0100
committerGitHub <noreply@github.com>2017-11-14 23:30:02 +0100
commit82502b10db073d1f9466998acbed852dfcb5852c (patch)
tree1ff296fca48161d70818d314d7d0e8495a0d844a /settings
parent80e527d21ea6cf408418710f9007e32980a5b4a8 (diff)
parenteb0f3ebf752f07f5dd721b8927514588b8428fc3 (diff)
downloadnextcloud-server-82502b10db073d1f9466998acbed852dfcb5852c.tar.gz
nextcloud-server-82502b10db073d1f9466998acbed852dfcb5852c.zip
Merge pull request #7169 from nextcloud/fix-user-search
Fix search in user managent when no group is selected
Diffstat (limited to 'settings')
-rw-r--r--settings/Controller/UsersController.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index d583dc8690d..68c920dde17 100644
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -308,7 +308,7 @@ class UsersController extends Controller {
$userObjects = [];
$users = [];
if ($this->isAdmin) {
- if ($gid !== '' && $gid !== '_disabledUsers') {
+ if ($gid !== '' && $gid !== '_disabledUsers' && $gid !== '_everyone') {
$batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset));
} else {
$batch = $this->userManager->search($pattern, $limit, $offset);