summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-03-15 08:34:21 +0100
committerGitHub <noreply@github.com>2018-03-15 08:34:21 +0100
commitf2b93f5246a4e7391634b9bd50737a06379e72fe (patch)
tree93468c0f07bad01a26fcb491ee87d33acb4d86c2 /lib
parent055d15e305b81be75fe838a9ac733d86818ea807 (diff)
parent0b96a71a68f10b23258c0090cc80b279d0d2f1aa (diff)
downloadnextcloud-server-f2b93f5246a4e7391634b9bd50737a06379e72fe.tar.gz
nextcloud-server-f2b93f5246a4e7391634b9bd50737a06379e72fe.zip
Merge pull request #8828 from nextcloud/fix-configuration-values-matched-in-user-searches
Fix configuration values matched in user searches
Diffstat (limited to 'lib')
-rw-r--r--lib/private/User/Database.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php
index 6e44c902286..8dad3ef5fcd 100644
--- a/lib/private/User/Database.php
+++ b/lib/private/User/Database.php
@@ -203,9 +203,9 @@ class Database extends Backend implements IUserBackend {
$query->select('uid', 'displayname')
->from('users', 'u')
->leftJoin('u', 'preferences', 'p', $query->expr()->andX(
- $query->expr()->eq('userid', 'uid')),
- $query->expr()->eq('appid', new Literal('settings')),
- $query->expr()->eq('configkey', new Literal('email'))
+ $query->expr()->eq('userid', 'uid'),
+ $query->expr()->eq('appid', $query->expr()->literal('settings')),
+ $query->expr()->eq('configkey', $query->expr()->literal('email')))
)
// sqlite doesn't like re-using a single named parameter here
->where($query->expr()->iLike('uid', $query->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')))