diff options
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/User/Database.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php index 471ff1f45ae..2d96369de63 100644 --- a/lib/private/User/Database.php +++ b/lib/private/User/Database.php @@ -194,7 +194,10 @@ class Database extends Backend implements IUserBackend { if ($search !== '') { $parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%'; $parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%'; - $searchLike = ' WHERE LOWER(`displayname`) LIKE LOWER(?) OR ' + $parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%'; + $searchLike .= ' LEFT JOIN `*PREFIX*preferences` ON `userid` = `uid` AND `appid` = \'settings\' AND `configkey` = \'email\''; + $searchLike .= ' WHERE LOWER(`configvalue`) LIKE LOWER(?)'; + $searchLike .= ' OR LOWER(`displayname`) LIKE LOWER(?) OR ' . 'LOWER(`uid`) LIKE LOWER(?)'; } @@ -288,8 +291,14 @@ class Database extends Backend implements IUserBackend { $parameters = []; $searchLike = ''; if ($search !== '') { + // Email + $parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%'; + $searchLike .= ' LEFT JOIN `*PREFIX*preferences` ON `userid` = `uid` AND `appid` = \'settings\' AND `configkey` = \'email\''; + $searchLike .= ' WHERE LOWER(`configvalue`) LIKE LOWER(?)'; + // UID $parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%'; - $searchLike = ' WHERE LOWER(`uid`) LIKE LOWER(?)'; + $searchLike .= ' OR LOWER(`uid`) LIKE LOWER(?)'; + // Display name $parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%'; $searchLike .= ' OR LOWER(`displayname`) LIKE LOWER(?)'; } |