浏览代码

iso-8859-1 test in imap_utf7_decode_local does not work

tokul 22 年之前
父节点
当前提交
9cd504edb4
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      functions/imap_utf7_local.php

+ 3 - 2
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