diff options
| author | Michael Tänzer <neo@nhng.de> | 2014-10-16 21:00:38 +0200 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2014-10-16 21:00:38 +0200 |
| commit | fb720bf477205d505c37a47eb29b965a4dcc2b04 (patch) | |
| tree | 3e7163d1ab4763141278fd64f3356d24db943db0 | |
| parent | 621d53d01f38c023e4947f4bbe1d31d984809465 (diff) | |
| parent | ea4fe47d7f3fb6926bae6d360c9d61e805999e00 (diff) | |
| download | cacert-devel-fb720bf477205d505c37a47eb29b965a4dcc2b04.tar.gz cacert-devel-fb720bf477205d505c37a47eb29b965a4dcc2b04.tar.xz cacert-devel-fb720bf477205d505c37a47eb29b965a4dcc2b04.zip | |
Merge remote-tracking branch 'origin/bug-1301' into release
| -rw-r--r-- | includes/general.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/general.php b/includes/general.php index 854aab4..26a369e 100644 --- a/includes/general.php +++ b/includes/general.php @@ -664,7 +664,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)); |