iso-8859-1 test in imap_utf7_decode_local does not work

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

diff --git a/functions/imap_utf7_local.php b/functions/imap_utf7_local.php
index 7845792795bc17a4833c6611ac3ea7c12b190940..4668d18ccccc5f3f88a90386852a16b570d94b6b 100644 (file)
--- a/functions/imap_utf7_local.php
+++ b/functions/imap_utf7_local.php
@@ -80,7 +80,8 @@ function imap_utf7_decode_local($s) {
     global $default_charset;
     set_my_charset();
 
-    if ( ! $default_charset == "iso-8859-1" ) {
+// FIXME: Something wrong. if I enable this test - decoding works incorrectly
+//    if ( ! $default_charset == "iso-8859-1" ) {
       // Allows mbstring functions only with iso-8859-*, utf-8 and 
       // iso-2022-jp (Japanese)
       // koi8-r and gb2312 can be added only in php 4.3+
@@ -91,7 +92,7 @@ function imap_utf7_decode_local($s) {
          return mb_convert_encoding($s, $default_charset, "UTF7-IMAP");
        }
       }
-    }
+//    }
 
     // Later code works only for ISO-8859-1