[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2-21-g8cebaca

[Michal Čihař]

The branch, QA_3_4 has been updated
       via  8cebaca19b08f8faa5eaebfdb2d87c466f274db8 (commit)
      from  c4c8fcb2b5fbf88fbe6dbcc987fd104d060eac4d (commit)


- Log -----------------------------------------------------------------
commit 8cebaca19b08f8faa5eaebfdb2d87c466f274db8
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Jun 14 09:15:07 2011 +0200

    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.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog     |    1 +
 db_search.php |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ee86372..2d2d054 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 fba68d1..d93fd74 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


hooks/post-receive
-- 
phpMyAdmin