This commit is contained in:
Marc Delisle
2003-02-02 12:27:52 +00:00
parent 62deef5fc8
commit 07b22cfd8f

View File

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