aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Lib/ThreadItem.php6
-rw-r--r--view/js/main.js2
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();
}