diff options
| author | Mario <mario@mariovavti.com> | 2022-01-19 11:25:06 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-01-19 11:25:06 +0000 |
| commit | 3318f093dabd679be55d5b7f5fab1e48dc0d4f94 (patch) | |
| tree | 4a6e011864ced6d55bc19576510f90f2ac88e81c /include/conversation.php | |
| parent | c3f5f6c7adeb1252483f3e35c8b69be240f4c1c0 (diff) | |
| parent | d98d56c3b5481e12dc53136c06b6c9c069d40d98 (diff) | |
| download | volse-hubzilla-3318f093dabd679be55d5b7f5fab1e48dc0d4f94.tar.gz volse-hubzilla-3318f093dabd679be55d5b7f5fab1e48dc0d4f94.tar.bz2 volse-hubzilla-3318f093dabd679be55d5b7f5fab1e48dc0d4f94.zip | |
Merge branch 'dev' into 7.0RC
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index bdd27c55f..17367856c 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -775,6 +775,12 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa $conv_link = ((in_array($item['item_type'],[ ITEM_TYPE_CARD, ITEM_TYPE_ARTICLE] )) ? $item['plink'] : z_root() . '/' . $conv_link_module . '/' . gen_link_id($conv_link_mid)); + $contact = []; + + if(App::$contacts && array_key_exists($item['author_xchan'],App::$contacts)) { + $contact = App::$contacts[$item['author_xchan']]; + } + $tmp_item = array( 'template' => $tpl, 'toplevel' => 'toplevel_item', @@ -838,7 +844,8 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa 'wait' => t('Please wait'), 'thread_level' => 1, 'has_tags' => $has_tags, - 'is_new' => $is_new + 'is_new' => $is_new, + 'contact_id' => (($contact) ? $contact['abook_id'] : '') ); $arr = array('item' => $item, 'output' => $tmp_item); |