浏览代码

utf-8 is already converted by ja_JP extra functions.

tokul 22 年之前
父节点
当前提交
e5ad747868
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      functions/i18n.php

+ 1 - 1
functions/i18n.php

@@ -203,7 +203,7 @@ function charset_decode ($charset, $string) {
     } else if ($charset == 'gb2312' and $agresive_decoding ) {
         include_once(SM_PATH . 'functions/decode/gb2312.php');
         $ret = charset_decode_gb2312 ($string);
-    } else if ($charset == 'utf-8') {
+    } else if ($charset == 'utf-8' && $squirrelmail_language != 'ja_JP') {
         include_once(SM_PATH . 'functions/decode/utf-8.php');
 	$ret = charset_decode_utf8 ($string);
     } else {