From 3eb55333c617f21714d691f0a393af5083ec464b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 9 Aug 2013 09:19:57 +0400 Subject: [PATCH] do not use iconv in tag_is_valid, data should be utf8 anyway at this point; remove sanity check for iconv because parser does not use it --- include/functions.php | 4 ---- include/sanity_check.php | 4 ---- 2 files changed, 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."); } */