aboutsummaryrefslogtreecommitdiffstats
path: root/include/html2bbcode.php
diff options
context:
space:
mode:
authorpafcu <pafcu@iki.fi>2014-10-21 00:02:08 +0300
committerpafcu <pafcu@iki.fi>2014-10-21 00:02:08 +0300
commit6fbd77069b8792b48cfbd45bd476b8acb5f98ed6 (patch)
tree7f1303769398dc0862a2941e64e7a42e4e39d10d /include/html2bbcode.php
parent6ee514579f85927e60fa5ebd2b89f97cbfe6544d (diff)
parentc080c420ba4e9f216708b63fdddb5c03bbea72c9 (diff)
downloadvolse-hubzilla-6fbd77069b8792b48cfbd45bd476b8acb5f98ed6.tar.gz
volse-hubzilla-6fbd77069b8792b48cfbd45bd476b8acb5f98ed6.tar.bz2
volse-hubzilla-6fbd77069b8792b48cfbd45bd476b8acb5f98ed6.zip
Merge pull request #2 from friendica/master
Sync with upstream
Diffstat (limited to 'include/html2bbcode.php')
-rw-r--r--include/html2bbcode.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index df430e6c7..6d6e6333b 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -283,8 +283,9 @@ function html2bbcode($message)
array('[b]', '[/b]', '[i]', '[/i]'), $message);
// Handling Yahoo style of mails
- $message = str_replace('[hr][b]From:[/b]', '[quote][b]From:[/b]', $message);
+ // $message = str_replace('[hr][b]From:[/b]', '[quote][b]From:[/b]', $message);
+ $message = htmlspecialchars($message,ENT_COMPAT,'UTF-8',false);
return(trim($message));
}