diff options
| author | Mario <mario@mariovavti.com> | 2019-05-03 08:41:01 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-05-03 08:41:01 +0200 |
| commit | c605c46f83b6dc5141f2506ba4b0047b299c26de (patch) | |
| tree | cdb5dfc38d62d0b5b1b6f563d19756bd3ef43798 | |
| parent | 9ef692b48ca9eb15a8d2a577aaecec63ac4c6bfe (diff) | |
| parent | 746d032e5801f14427e3eafde7cee08e3ca56cb4 (diff) | |
| download | volse-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
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 6 | ||||
| -rw-r--r-- | view/js/main.js | 2 |
2 files changed, 4 insertions, 4 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'), diff --git a/view/js/main.js b/view/js/main.js index 325ad9a51..b99fc0586 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1155,7 +1155,7 @@ function doreply(parent, ident, owner, hint) { var btn = i.html().replace(/<[^>]*>/g, '').trim(); i.html('<i class="fa fa-reply" ></i> ' + btn); i.prop('title', hint); - form.find('textarea').val("@{" + owner + "}\n"); + form.find('textarea').val("@{" + owner + "} "); $('#comment-edit-text-' + parent.toString()).focus(); } |