nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove possible double charset conversion.

Browse Source
This commit is contained in:
Michal Čihař
2004-03-09 14:01:17 +00:00
parent 2ed606d914
commit 8fcbd55910
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $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> 2004-03-05 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.lib.php: bug 909752, floating point digit * libraries/sqlparser.lib.php: bug 909752, floating point digit
* libraries/sqlparser.lib.php: bug 906551, GRANT...TO * libraries/sqlparser.lib.php: bug 906551, GRANT...TO

2
libraries/dbi/mysql.dbi.lib.php
View File

@@ -119,7 +119,7 @@ function PMA_DBI_try_query($query, $link = NULL, $options = 0) {
if (PMA_MYSQL_INT_VERSION < 40100) { if (PMA_MYSQL_INT_VERSION < 40100) {
$query = PMA_convert_charset($query); $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. // The following function is meant for internal use only.