aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-05-03 08:41:01 +0200
committerMario <mario@mariovavti.com>2019-05-03 08:41:01 +0200
commitc605c46f83b6dc5141f2506ba4b0047b299c26de (patch)
treecdb5dfc38d62d0b5b1b6f563d19756bd3ef43798 /Zotlabs/Lib
parent9ef692b48ca9eb15a8d2a577aaecec63ac4c6bfe (diff)
parent746d032e5801f14427e3eafde7cee08e3ca56cb4 (diff)
downloadvolse-hubzilla-c605c46f83b6dc5141f2506ba4b0047b299c26de.tar.gz
volse-hubzilla-c605c46f83b6dc5141f2506ba4b0047b299c26de.tar.bz2
volse-hubzilla-c605c46f83b6dc5141f2506ba4b0047b299c26de.zip
Merge branch 'replyto_fixes' into 'dev'
provide xchan_url if there is no xchan_addr See merge request hubzilla/core!1622
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/ThreadItem.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 3f1888d30..d6f2bb2d0 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -373,14 +373,14 @@ class ThreadItem {
'id' => $this->get_id(),
'mid' => $item['mid'],
'parent' => $item['parent'],
- 'author_id' => $item['author']['xchan_addr'],
+ 'author_id' => (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url']),
'isevent' => $isevent,
'attend' => $attend,
'consensus' => $consensus,
'conlabels' => $conlabels,
'canvote' => $canvote,
- 'linktitle' => sprintf( t('View %s\'s profile - %s'), $profile_name, $item['author']['xchan_addr']),
- 'olinktitle' => sprintf( t('View %s\'s profile - %s'), $this->get_owner_name(), $item['owner']['xchan_addr']),
+ 'linktitle' => sprintf( t('View %s\'s profile - %s'), $profile_name, (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url'])),
+ 'olinktitle' => sprintf( t('View %s\'s profile - %s'), $this->get_owner_name(), (($item['owner']['xchan_addr']) ? $item['owner']['xchan_addr'] : $item['owner']['xchan_url'])),
'llink' => $item['llink'],
'viewthread' => $viewthread,
'to' => t('to'),