diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-11-14 23:30:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 23:30:02 +0100 |
| commit | 82502b10db073d1f9466998acbed852dfcb5852c (patch) | |
| tree | 1ff296fca48161d70818d314d7d0e8495a0d844a | |
| parent | 80e527d21ea6cf408418710f9007e32980a5b4a8 (diff) | |
| parent | eb0f3ebf752f07f5dd721b8927514588b8428fc3 (diff) | |
| download | nextcloud-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
| -rw-r--r-- | lib/private/User/Database.php | 2 | ||||
| -rw-r--r-- | settings/Controller/UsersController.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php index a835ca3384e..471ff1f45ae 100644 --- a/lib/private/User/Database.php +++ b/lib/private/User/Database.php @@ -290,6 +290,8 @@ class Database extends Backend implements IUserBackend { if ($search !== '') { $parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%'; $searchLike = ' WHERE LOWER(`uid`) LIKE LOWER(?)'; + $parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%'; + $searchLike .= ' OR LOWER(`displayname`) LIKE LOWER(?)'; } $query = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users`' . $searchLike . ' ORDER BY LOWER(`uid`) ASC', $limit, $offset); 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); |