aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Case <kahotep@bunda.dreamhost.com>2011-02-14 05:44:27 -0800
committerChris Case <kahotep@bunda.dreamhost.com>2011-02-14 05:44:27 -0800
commit42eb6dd723abd31aaaf6c1608f2dec645f4e20b5 (patch)
treeaa10b102a587cd0336e83c9ae304ca447aab6be9
parent94e0c3c97044ea2fd3f9bcfcbd07dd6215d084a0 (diff)
downloadvolse-hubzilla-42eb6dd723abd31aaaf6c1608f2dec645f4e20b5.tar.gz
volse-hubzilla-42eb6dd723abd31aaaf6c1608f2dec645f4e20b5.tar.bz2
volse-hubzilla-42eb6dd723abd31aaaf6c1608f2dec645f4e20b5.zip
fixed a bbcode issue with rich text html messages, fixed some issues with plain text.
-rw-r--r--mod/dfrn_notify.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index ffd9020c5..7231e8fd2 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -198,10 +198,10 @@ function dfrn_notify_post(&$a) {
$msg['textversion']
- = html_entity_decode(strip_tags(bbcode(stripslashes($msg['body']))),ENT_QUOTES,'UTF-8');
+ = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",$msg['body']))),ENT_QUOTES,'UTF-8'));
//$TextMessage = html_entity_decode(strip_tags(bbcode(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",$msg['body'])))); ;
$msg['htmlversion']
- = str_replace(array("\\r\\n", "\\r", "\\n"), "<br />\n",html_entity_decode($msg['body']));
+ = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "<br />\n",$msg['body']))));
$tpl = load_view_file('view/mail_received_eml.tpl');
$email_tpl = replace_macros($tpl, array(