do not use iconv in tag_is_valid, data should be utf8 anyway at this point; remove...

diff --git a/include/functions.php b/include/functions.php
index 6bc52e9d95db0cf1969daca91118580b8f7f8b53..f447d06f53a037759699dff53afe7eae7be70cd9 100644 (file)
--- 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 f3621da6f80cfc21f3eeafdbaa17dcd5cc8bd628..1aa581bfc565ad18b113a54237c4a6cd38fbe112 100644 (file)
--- 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.");
                        } */