aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-06-17 16:21:03 -0700
committerfriendica <info@friendica.com>2013-06-17 16:21:03 -0700
commit94c758080ff0b957d7d728428de5821c39a583e9 (patch)
treeedfdb7962c0ef4164f61d8db64ee9574551df13f /include
parentf4e8198335960465b4ac6106f59e0346d08ece1f (diff)
downloadvolse-hubzilla-94c758080ff0b957d7d728428de5821c39a583e9.tar.gz
volse-hubzilla-94c758080ff0b957d7d728428de5821c39a583e9.tar.bz2
volse-hubzilla-94c758080ff0b957d7d728428de5821c39a583e9.zip
zidify bodies of notification emails
Diffstat (limited to 'include')
-rw-r--r--include/enotify.php16
1 files changed, 15 insertions, 1 deletions
diff --git a/include/enotify.php b/include/enotify.php
index 5728d054c..0a6befba1 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -354,8 +354,22 @@ function notification($params) {
$textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",
$body))),ENT_QUOTES,'UTF-8'));
+
$htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"),
- "<br />\n",$body))));
+ "<br />\n",$body))), ENT_QOUTES,'UTF-8');
+
+
+ // use $_SESSION['zid_override'] to force zid() to use
+ // the recipient address instead of the current observer
+
+ $_SESSION['zid_override'] = $recip['channel_address'] . '@' . $get_app()->get_hostname();
+
+ $textversion = zidify_links($textversion);
+ $htmlversion = zidify_links($htmlversion);
+
+ // unset when done to revert to normal behaviour
+
+ unset($_SESSION['zid_override']);
$datarray = array();