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

Do not convert, if charsets are same.

Browse Source
This commit is contained in:
Michal Čihař
2004-06-07 13:24:35 +00:00
parent acbee620e0
commit 30c6f6f58b
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -11,6 +11,8 @@ $Source$
2004-06-07 Michal Čihař <michal@cihar.com> 2004-06-07 Michal Čihař <michal@cihar.com>
* lang/czech: Updated. * lang/czech: Updated.
* libraries/charset_conversion.lib.php: Do not convert, if charsets are
same.
2004-06-07 Alexander M. Turek <me@derrabus.de> 2004-06-07 Alexander M. Turek <me@derrabus.de>
* css/phpmyadmin.css.php: beautifications. * css/phpmyadmin.css.php: beautifications.

1
libraries/charset_conversion.lib.php
View File

@@ -240,6 +240,7 @@ function PMA_convert_charset($what) {
* @author nijel * @author nijel
*/ */
function PMA_convert_string($src_charset, $dest_charset, $what) { function PMA_convert_string($src_charset, $dest_charset, $what) {
if ($src_charset == $dest_charset) return $what;
switch ($GLOBALS['PMA_recoding_engine']) { switch ($GLOBALS['PMA_recoding_engine']) {
case PMA_CHARSET_RECODE: case PMA_CHARSET_RECODE:
return recode_string($src_charset . '..' . $dest_charset, $what); return recode_string($src_charset . '..' . $dest_charset, $what);