nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Reformatting

Browse source
This commit is contained in:
Michael 2021-09-23 21:53:52 +00:00
parent a6c85f6106
commit f696fce824
1 changed files with 92 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Content/Conversation.php
View file

@ -685,7 +685,7 @@ class Conversation
'drop' => $drop, 'drop' => $drop,
'vote' => $likebuttons, 'vote' => $likebuttons,
'like_html' => '', 'like_html' => '',
'dislike_html' => '', 'dislike_html ' => '',
'comment_html' => '', 'comment_html' => '',
'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> $this->l10n->t('View in context')]), 'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> $this->l10n->t('View in context')]),
'previewing' => $previewing, 'previewing' => $previewing,
@ -805,8 +805,10 @@ class Conversation
if (!empty($activity)) { if (!empty($activity)) {
if (($row['gravity'] == GRAVITY_PARENT)) { if (($row['gravity'] == GRAVITY_PARENT)) {
$row['post-reason'] = ItemModel::PR_ANNOUNCEMENT; $row['post-reason'] = ItemModel::PR_ANNOUNCEMENT;
$row = array_merge($row, $activity); $row = array_merge($row, $activity);
$contact = Contact::getById($activity['causer-id'], ['url', 'name', 'thumb']); $contact = Contact::getById($activity['causer-id'], ['url', 'name', 'thumb']);
$row['causer-link'] = $contact['url']; $row['causer-link'] = $contact['url'];
$row['causer-avatar'] = $contact['thumb']; $row['causer-avatar'] = $contact['thumb'];
$row['causer-name'] = $contact['name']; $row['causer-name'] = $contact['name'];