浏览代码

Repair my mistake : wrong arguments order for stristr (still not used to php's order :(

alex-brainstorm 22 年之前
父节点
当前提交
858e5ba110
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      functions/imap_utf7_local.php

+ 3 - 3
functions/imap_utf7_local.php

@@ -16,9 +16,9 @@ function sqimap_mb_convert_encoding($str, $to_encoding, $from_encoding, $default
   // Allows mbstring functions only with iso-8859-*, utf-8 and 
   // Allows mbstring functions only with iso-8859-*, utf-8 and 
   // iso-2022-jp (Japanese)
   // iso-2022-jp (Japanese)
   // koi8-r and gb2312 can be added only in php 4.3+
   // koi8-r and gb2312 can be added only in php 4.3+
-  if ( stristr('iso-8859-',substr($default_charset,0,9)) ||
-       stristr('utf-8',$default_charset) || 
-       stristr('iso-2022-jp',$default_charset) ) {
+  if ( stristr($default_charset, 'iso-8859-') ||
+       stristr($default_charset, 'utf-8') || 
+       stristr($default_charset, 'iso-2022-jp') ) {
     if (function_exists('mb_convert_encoding')) {
     if (function_exists('mb_convert_encoding')) {
       return mb_convert_encoding($str, $to_encoding, $from_encoding);
       return mb_convert_encoding($str, $to_encoding, $from_encoding);
     }
     }