diff options
| author | zotlabs <mike@macgirvin.com> | 2018-12-03 19:19:31 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-12-03 19:19:31 -0800 |
| commit | ffc3dba6825933d8e3ddc1a9a1ee93785acb2fca (patch) | |
| tree | 6b42761029370c325064d2790b4c3d8debb7dd38 /Zotlabs/Lib | |
| parent | 1acc5ceb5f17b3bd36eeba9245c4bb3923793c34 (diff) | |
| parent | 5e14da67e1329947a14cc4f009cebcfe4a5ece2f (diff) | |
| download | volse-hubzilla-ffc3dba6825933d8e3ddc1a9a1ee93785acb2fca.tar.gz volse-hubzilla-ffc3dba6825933d8e3ddc1a9a1ee93785acb2fca.tar.bz2 volse-hubzilla-ffc3dba6825933d8e3ddc1a9a1ee93785acb2fca.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index 523ccf93a..5e5798cac 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -828,7 +828,7 @@ class Enotify { $x = array( 'notify_link' => $item['llink'], 'name' => $item['author']['xchan_name'], - 'addr' => $item['author']['xchan_addr'], + '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']), |