harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'replyto_fixes' into 'dev'

Browse Source 
provide xchan_url if there is no xchan_addr

See merge request hubzilla/core!1622
This commit is contained in:
Mario 2019-05-03 08:41:01 +02:00
commit c605c46f83
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zotlabs/Lib/ThreadItem.php
View File

@ -373,14 +373,14 @@ class ThreadItem {
'id' => $this->get_id(), 'id' => $this->get_id(),
'mid' => $item['mid'], 'mid' => $item['mid'],
'parent' => $item['parent'], '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, 'isevent' => $isevent,
'attend' => $attend, 'attend' => $attend,
'consensus' => $consensus, 'consensus' => $consensus,
'conlabels' => $conlabels, 'conlabels' => $conlabels,
'canvote' => $canvote, 'canvote' => $canvote,
'linktitle' => sprintf( t('View %s\'s profile - %s'), $profile_name, $item['author']['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']), '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'], 'llink' => $item['llink'],
'viewthread' => $viewthread, 'viewthread' => $viewthread,
'to' => t('to'), 'to' => t('to'),

2
view/js/main.js
View File

@ -1155,7 +1155,7 @@ function doreply(parent, ident, owner, hint) {
var btn = i.html().replace(/<[^>]*>/g, '').trim(); var btn = i.html().replace(/<[^>]*>/g, '').trim();
i.html('<i class="fa fa-reply" ></i> ' + btn); i.html('<i class="fa fa-reply" ></i> ' + btn);
i.prop('title', hint); i.prop('title', hint);
form.find('textarea').val("@{" + owner + "}\n"); form.find('textarea').val("@{" + owner + "} ");
$('#comment-edit-text-' + parent.toString()).focus(); $('#comment-edit-text-' + parent.toString()).focus();
} }