merge from upstream

2012-08-15 20:01:55 -07:00
parent 2a49460c77
commit 2358a220ba
5 changed files with 13 additions and 6 deletions
--- a/include/text.php
+++ b/include/text.php
@@ -70,7 +70,8 @@ function notags($string) {
 if(! function_exists('escape_tags')) {
 function escape_tags($string) {

-	return(htmlspecialchars($string));
+	return(htmlspecialchars($string, ENT_QUOTES, 'UTF-8', false));
+
 }}