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 d7aac46ca69134c868c7d7dae773cf0a511fadaf..03153615e4b375286036d8cb30f085caa02b33f5 100644 (file)
--- 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) {
  * @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;
 
     if ($squirrelmail_language == 'ja_JP')
         return $string;