Reformatting
This commit is contained in:
parent
a6c85f6106
commit
f696fce824
1 changed files with 92 additions and 90 deletions
|
@ -685,7 +685,7 @@ class Conversation
|
|||
'drop' => $drop,
|
||||
'vote' => $likebuttons,
|
||||
'like_html' => '',
|
||||
'dislike_html' => '',
|
||||
'dislike_html ' => '',
|
||||
'comment_html' => '',
|
||||
'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> $this->l10n->t('View in context')]),
|
||||
'previewing' => $previewing,
|
||||
|
@ -805,8 +805,10 @@ class Conversation
|
|||
if (!empty($activity)) {
|
||||
if (($row['gravity'] == GRAVITY_PARENT)) {
|
||||
$row['post-reason'] = ItemModel::PR_ANNOUNCEMENT;
|
||||
|
||||
$row = array_merge($row, $activity);
|
||||
$contact = Contact::getById($activity['causer-id'], ['url', 'name', 'thumb']);
|
||||
|
||||
$row['causer-link'] = $contact['url'];
|
||||
$row['causer-avatar'] = $contact['thumb'];
|
||||
$row['causer-name'] = $contact['name'];
|
||||
|
|
Loading…
Reference in a new issue