utf-8 is already converted by ja_JP extra functions.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6028 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/i18n.php b/functions/i18n.php
index 10fe4e8e689d4792ceeb5710272379c3b10eea56..03c485547bd16725786b427ab51df4303afc2f7e 100644 (file)
--- a/functions/i18n.php
+++ b/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 == '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 {
         include_once(SM_PATH . 'functions/decode/utf-8.php');
        $ret = charset_decode_utf8 ($string);
     } else {