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

diacritics wrongly converted in Browse mode on MySQL 4.1.x if AllowAnywhereRecoding set to TRUE

Browse Source
This commit is contained in:
Marc Delisle
2005-05-22 11:38:16 +00:00
parent fbed0678c7
commit fa0ff4acd5
2 changed files with 7 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$
2005-05-22 Marc Delisle <lem9@users.sourceforge.net>
* libraries/charset_conversion.lib.php: diacritics wrongly converted
in Browse mode under MySQL 4.1.x if AllowAnywhereRecoding set to TRUE
2005-05-19 Marc Delisle <lem9@users.sourceforge.net> 2005-05-19 Marc Delisle <lem9@users.sourceforge.net>
* tbl_select.php: bug #1204235, searching on a VARBINARY field * tbl_select.php: bug #1204235, searching on a VARBINARY field

4
libraries/charset_conversion.lib.php
View File

@@ -139,7 +139,8 @@ function PMA_convert_display_charset($what) {
global $cfg, $allow_recoding, $charset, $convcharset; global $cfg, $allow_recoding, $charset, $convcharset;
if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding) if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)
|| $convcharset == $charset) { // rabus: if input and output charset are the same, we don't have to do anything... || $convcharset == $charset // rabus: if input and output charset are the same, we don't have to do anything...
|| PMA_MYSQL_INT_VERSION >= 40100 ) { // lem9: even if AllowAnywhereRecoding is TRUE, do not recode for MySQL >= 4.1.x since MySQL does the job
return $what; return $what;
} }
else if (is_array($what)) { else if (is_array($what)) {
@@ -158,6 +159,7 @@ function PMA_convert_display_charset($what) {
return $result; return $result;
} }
else if (is_string($what)) { else if (is_string($what)) {
switch ($GLOBALS['PMA_recoding_engine']) { switch ($GLOBALS['PMA_recoding_engine']) {
case PMA_CHARSET_RECODE: case PMA_CHARSET_RECODE:
return recode_string($convcharset . '..' . $charset, $what); return recode_string($convcharset . '..' . $charset, $what);