From: tokul <tokul@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 8 Nov 2004 15:56:48 +0000 (+0000)
Subject: don't run decode cycles if charset is the same
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=042ed9f70429487c97eb36b44c6bdee699a75158

don't run decode cycles if charset is the same


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

diff --git a/functions/decode/utf_8.php b/functions/decode/utf_8.php
index d7aac46c..03153615 100644
--- a/functions/decode/utf_8.php
+++ b/functions/decode/utf_8.php
@@ -27,7 +27,10 @@
  * @return string Decoded string
  */
 function charset_decode_utf_8 ($string) {
-  global $squirrelmail_language;
+    global $squirrelmail_language, $default_charset;
+
+    if (strtolower($default_charset) == 'utf-8')
+        return $string;
 
     if ($squirrelmail_language == 'ja_JP')
         return $string;