summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-01-03 16:15:50 +0100
committerBenny Baumann <BenBE@geshi.org>2015-01-03 16:15:50 +0100
commit0267223199c2dac653216eee63cd9a95048551e8 (patch)
tree30d797fab7c0ea5563dbbe922bd3959314125fff
parent8e38a22d467d56a29d20ad0b75c4442cd9268134 (diff)
parent88de5d85640962e8b0b0df14bcc5801a8858ffd4 (diff)
downloadcacert-devel-0267223199c2dac653216eee63cd9a95048551e8.tar.gz
cacert-devel-0267223199c2dac653216eee63cd9a95048551e8.tar.xz
cacert-devel-0267223199c2dac653216eee63cd9a95048551e8.zip
Merge branch 'bug-1354' into testserver-stable
-rw-r--r--includes/general.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/general.php b/includes/general.php
index fe43a96..939c01c 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -604,7 +604,8 @@
$after = substr($data, $pos + 4);
$data = $before.$char.$after;
}
- return charset_decode_utf8($data);
+
+ return htmlentities(charset_decode_utf8($data), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8', false);
}
function signmail($to, $subject, $message, $from, $replyto = "")