From 1a7bb1fb75084fbcd4d81c8c24820631e3df4d64 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Sep 2013 19:40:21 -0700 Subject: The triple linebreaks in notification emails finally bothered me enough to do something about it. --- include/enotify.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/enotify.php b/include/enotify.php index a15e42b73..b2a4f5856 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -379,11 +379,9 @@ function notification($params) { logger('notification: sending notification email'); - $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n", - $body))),ENT_QUOTES,'UTF-8')); + $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r", "\\n"), array( "", "\n"), $body))),ENT_QUOTES,'UTF-8')); - $htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), - "
\n",$body))), ENT_QUOTES,'UTF-8'); + $htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r","\\n"), array("","
\n"),$body))), ENT_QUOTES,'UTF-8'); // use $_SESSION['zid_override'] to force zid() to use -- cgit v1.2.3