From 8cebaca19b08f8faa5eaebfdb2d87c466f274db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 14 Jun 2011 09:15:07 +0200 Subject: [PATCH] bug #3315720 [search] Fix search in non unicode tables We need to convert field to unicode because the connection is in utf-8 and we might give utf-8 input as well. --- ChangeLog | 1 + db_search.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ee8637270..2d2d05485 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ - patch #3311539 [edit] Inline edit does not escape backslashes - bug #3313210 [interface] Columns class sometimes changed for nothing - patch #3313326 [interface] Some tooltips do not disappear +- bug #3315720 [search] Fix search in non unicode tables 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/db_search.php b/db_search.php index fba68d17f..d93fd74d8 100644 --- a/db_search.php +++ b/db_search.php @@ -178,7 +178,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