* adjust for convertEncoding.

2019-09-19 14:20:48 +08:00
parent 38956c102f
commit 003f68c25d
1 changed files with 2 additions and 2 deletions
@@ -96,7 +96,7 @@ class helper extends baseHelper
            if($position !== false) $toEncoding = substr($toEncoding, 0, $position);

            /* Check string encoding. */
-            $encoding = strtolower(mb_detect_encoding($string, array('ASCII','UTF-8','GB2312','GBK','BIG5')));
+            $encoding = strtolower(mb_detect_encoding($string, mb_list_encodings()));
            if($encoding == $toEncoding) return $string;
            return mb_convert_encoding($string, $toEncoding, $encoding);
        }
@@ -178,4 +178,4 @@ function autoloader($class)
    }
 }

-spl_autoload_register('autoloader');
+spl_autoload_register('autoloader');