aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-02 19:40:21 -0700
committerfriendica <info@friendica.com>2013-09-02 19:40:21 -0700
commit1a7bb1fb75084fbcd4d81c8c24820631e3df4d64 (patch)
treead8f50677300d06edead647b3e630508dc6ae3b0 /include
parenta32d86f0a07e244faeb3fde36c002d9657b3552d (diff)
downloadvolse-hubzilla-1a7bb1fb75084fbcd4d81c8c24820631e3df4d64.tar.gz
volse-hubzilla-1a7bb1fb75084fbcd4d81c8c24820631e3df4d64.tar.bz2
volse-hubzilla-1a7bb1fb75084fbcd4d81c8c24820631e3df4d64.zip
The triple linebreaks in notification emails finally bothered me enough to do something about it.
Diffstat (limited to 'include')
-rw-r--r--include/enotify.php6
1 files changed, 2 insertions, 4 deletions
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"),
- "<br />\n",$body))), ENT_QUOTES,'UTF-8');
+ $htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r","\\n"), array("","<br />\n"),$body))), ENT_QUOTES,'UTF-8');
// use $_SESSION['zid_override'] to force zid() to use