From 96d985e56dd20e2045e07673fc42e1ad908b398e Mon Sep 17 00:00:00 2001 From: tokul Date: Mon, 27 Oct 2003 16:55:02 +0000 Subject: [PATCH] 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 --- functions/i18n.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/i18n.php b/functions/i18n.php index 10fe4e8e..03c48554 100644 --- 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 == '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 { -- 2.25.1