aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib/Enotify.php
diff options
context:
space:
mode:
authorManuel Jiménez Friaza <mjfriaza@openmailbox.org>2018-12-05 12:32:33 +0100
committerManuel Jiménez Friaza <mjfriaza@openmailbox.org>2018-12-05 12:32:33 +0100
commit4cd5529027efa19288ddce125f0d41ccb5519578 (patch)
tree69b5bb1b43d807908d38d7febec21732fd334a49 /Zotlabs/Lib/Enotify.php
parent5ac08ec3aa8ede14141390670a8097a60769e11e (diff)
parentd12744011affe7f6b79201442ad9fce6e083bdbb (diff)
downloadvolse-hubzilla-4cd5529027efa19288ddce125f0d41ccb5519578.tar.gz
volse-hubzilla-4cd5529027efa19288ddce125f0d41ccb5519578.tar.bz2
volse-hubzilla-4cd5529027efa19288ddce125f0d41ccb5519578.zip
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Lib/Enotify.php')
-rw-r--r--Zotlabs/Lib/Enotify.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 25c96d9cc..5e5798cac 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -828,6 +828,7 @@ class Enotify {
$x = array(
'notify_link' => $item['llink'],
'name' => $item['author']['xchan_name'],
+ 'addr' => (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url']),
'url' => $item['author']['xchan_url'],
'photo' => $item['author']['xchan_photo_s'],
'when' => relative_date(($edit)? $item['edited'] : $item['created']),