summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-08-30 00:54:28 +0200
committerBenny Baumann <BenBE@geshi.org>2014-08-30 00:54:28 +0200
commit192c3cd186369b5e6e5fe3bd37f6aebf2b49a162 (patch)
treeba4c613558ca5331478fabc6f5a3fd9fc8cd1891
parent38cd04036a00f1e115966991f6f99e1a58217b99 (diff)
parentea4fe47d7f3fb6926bae6d360c9d61e805999e00 (diff)
downloadcacert-devel-192c3cd186369b5e6e5fe3bd37f6aebf2b49a162.tar.gz
cacert-devel-192c3cd186369b5e6e5fe3bd37f6aebf2b49a162.tar.xz
cacert-devel-192c3cd186369b5e6e5fe3bd37f6aebf2b49a162.zip
Merge branch 'bug-1301' into testserver-stable
-rw-r--r--includes/general.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/general.php b/includes/general.php
index 1c25bd5..f332815 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -703,7 +703,7 @@
function sanitizeHTML($input)
{
- return htmlentities(strip_tags($input), ENT_QUOTES);
+ return htmlentities(strip_tags($input), ENT_QUOTES, 'ISO-8859-1');
//In case of problems, please use the following line again:
//return htmlentities(strip_tags(utf8_decode($input)), ENT_QUOTES);
//return htmlspecialchars(strip_tags($input));