valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Perry Werneck 2013-08-11 10:41:50 -03:00
parent 4c33d3e534 3eb55333c6
commit f0feea33ce
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions.php
View File

@ -3039,10 +3039,6 @@
if (preg_match("/^[0-9]*$/", $tag)) return false; if (preg_match("/^[0-9]*$/", $tag)) return false;
if (mb_strlen($tag) > 250) return false; if (mb_strlen($tag) > 250) return false;
if (function_exists('iconv')) {
$tag = iconv("utf-8", "utf-8", $tag);
}
if (!$tag) return false; if (!$tag) return false;
return true; return true;

4
include/sanity_check.php
View File

@ -138,10 +138,6 @@
array_push($errors, "PHP support for ctype functions are required by HTMLPurifier."); 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")) { /* if (ini_get("safe_mode")) {
array_push($errors, "PHP safe mode setting is not supported."); array_push($errors, "PHP safe mode setting is not supported.");
} */ } */