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

bugfix

Browse Source
This commit is contained in:
Marc Delisle
2003-02-02 12:27:52 +00:00
parent 62deef5fc8
commit 07b22cfd8f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/kanji-encoding.lib.php3
View File

@@ -79,18 +79,17 @@ if (!defined('PMA_ENCODING_LIB_INCLUDED')) {
if ($enc == '' && $kana == '') { if ($enc == '' && $kana == '') {
return $str; return $str;
} }
$nw = mb_detect_encoding($str, $enc_list); $nw = mb_detect_encoding($str, $enc_list);
if ($kana == 'kana') { if ($kana == 'kana') {
$dist = mb_convert_kana($str, 'KV', $nw); $dist = mb_convert_kana($str, 'KV', $nw);
$str = $dist; $str = $dist;
} }
if ($nw != $enc && $enc) { if ($nw != $enc && $enc != '') {
$dist = mb_convert_encoding($str, $enc, $nw); $dist = mb_convert_encoding($str, $enc, $nw);
} else { } else {
$dist = $str; $dist = $str;
} }
return $dist; return $dist;
} // end of the 'PMA_kanji_str_conv' function } // end of the 'PMA_kanji_str_conv' function