diff options
| author | Aris Feryanto <aris_feryanto@yahoo.com> | 2011-06-15 04:23:06 +0400 |
|---|---|---|
| committer | Aris Feryanto <aris_feryanto@yahoo.com> | 2011-06-15 04:23:06 +0400 |
| commit | d28d7daba1a15b184cebaadc94dad787170260e5 (patch) | |
| tree | a333056bdcb12054e6e316502e8eda33fd7c6c43 /db_search.php | |
| parent | 73b9166240e1ed5cca413499825bf096d87d1536 (diff) | |
| parent | 25dc50a5dd8a69f435272d37f7febafffc1d0ff0 (diff) | |
Fix merge conflict with origin/master
Diffstat (limited to 'db_search.php')
| -rw-r--r-- | db_search.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db_search.php b/db_search.php index d9d7ea13ac..a91bf87521 100644 --- a/db_search.php +++ b/db_search.php @@ -180,7 +180,7 @@ if (isset($_REQUEST['submit_search'])) { $thefieldlikevalue = array(); foreach ($tblfields as $tblfield) { if (! isset($field) || strlen($field) == 0 || $tblfield == $field) { - $thefieldlikevalue[] = PMA_backquote($tblfield) + $thefieldlikevalue[] = 'CONVERT(' . PMA_backquote($tblfield) . ' USING utf8)' . ' ' . $like_or_regex . ' ' . "'" . $automatic_wildcard . $search_word |