diff options
author | Perry Werneck <[email protected]> | 2013-08-11 10:41:50 -0300 |
---|---|---|
committer | Perry Werneck <[email protected]> | 2013-08-11 10:41:50 -0300 |
commit | f0feea33ce757f1f1913de0aff8a3cebdd287e7c (patch) | |
tree | 6bf8523b55419d8eafcd46bdddae8a38cce152f3 | |
parent | 4c33d3e534a3ae2a0a724648d24988ee0ae72c74 (diff) | |
parent | 3eb55333c617f21714d691f0a393af5083ec464b (diff) |
Merge remote-tracking branch 'upstream/master'
-rw-r--r-- | include/functions.php | 4 | ||||
-rw-r--r-- | include/sanity_check.php | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/functions.php b/include/functions.php index 6bc52e9d9..f447d06f5 100644 --- a/include/functions.php +++ b/include/functions.php @@ -3039,10 +3039,6 @@ if (preg_match("/^[0-9]*$/", $tag)) return false; if (mb_strlen($tag) > 250) return false; - if (function_exists('iconv')) { - $tag = iconv("utf-8", "utf-8", $tag); - } - if (!$tag) return false; return true; diff --git a/include/sanity_check.php b/include/sanity_check.php index f3621da6f..1aa581bfc 100644 --- a/include/sanity_check.php +++ b/include/sanity_check.php @@ -138,10 +138,6 @@ array_push($errors, "PHP support for ctype functions are required by HTMLPurifier."); } - if (!function_exists("iconv")) { - array_push($errors, "PHP support for iconv is required to handle multiple charsets."); - } - /* if (ini_get("safe_mode")) { array_push($errors, "PHP safe mode setting is not supported."); } */ |