From 8fcbd55910c4a4697bb9e83dd5b1311a27a9b060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 9 Mar 2004 14:01:17 +0000
Subject: [PATCH] Remove possible double charset conversion.

---
 ChangeLog                       | 4 ++++
 libraries/dbi/mysql.dbi.lib.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ff8d4668c..1c1a96bb3 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-03-09 Michal Cihar  <backtowork@cihar.com>
+    * libraries/dbi/mysql.dbi.lib.php: Remove possible double charset
+      conversion.
+
 2004-03-05 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/sqlparser.lib.php: bug 909752, floating point digit
     * libraries/sqlparser.lib.php: bug 906551, GRANT...TO
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index 3511e03ae..4bc89e2aa 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -119,7 +119,7 @@ function PMA_DBI_try_query($query, $link = NULL, $options = 0) {
     if (PMA_MYSQL_INT_VERSION < 40100) {
         $query = PMA_convert_charset($query);
     }
-    return mysql_query(PMA_convert_charset($query), $link);
+    return mysql_query($query, $link);
 }
 
 // The following function is meant for internal use only.