Merge remote-tracking branch 'origin/master' into develop

2017-12-07 14:14:50 +01:00
parent 548652aab1 a62ebb3e59
commit beb9f8ee74
42 changed files with 476 additions and 194 deletions
@@ -401,7 +401,7 @@ func SearchUsers(query *m.SearchUsersQuery) error {
 	}

 	if query.Query != "" {
-		whereConditions = append(whereConditions, "(email LIKE ? OR name LIKE ? OR login like ?)")
+		whereConditions = append(whereConditions, "(email "+dialect.LikeStr()+" ? OR name "+dialect.LikeStr()+" ? OR login "+dialect.LikeStr()+" ?)")
 		whereParams = append(whereParams, queryWithWildcards, queryWithWildcards, queryWithWildcards)
 	}