diff options
author | Mario <mario@mariovavti.com> | 2020-11-26 18:43:53 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2020-11-26 18:43:53 +0000 |
commit | 0f6166da004317045bae5430140c70ee0d60aad1 (patch) | |
tree | 78145aa23c2c60acab9add4299ee50935898a46a /include/conversation.php | |
parent | 25620081a1326eb243c974845d613a16b7be1966 (diff) | |
parent | 07e5b8295ea9d342f66d8119d88bd58124b548e6 (diff) | |
download | volse-hubzilla-5.0.3.tar.gz volse-hubzilla-5.0.3.tar.bz2 volse-hubzilla-5.0.3.zip |
Merge branch 'dev'5.0.3
Diffstat (limited to 'include/conversation.php')
-rw-r--r-- | include/conversation.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index e77404cff..6615b04c3 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -511,6 +511,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa $jsreload = ''; $preview = (($page_mode === 'preview') ? true : false); + $r_preview = (($page_mode === 'r_preview') ? true : false); $previewing = (($preview) ? ' preview ' : ''); $preview_lbl = t('This is an unsaved preview'); @@ -873,11 +874,13 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa } + $item['pagedrop'] = $page_dropping; - if($item['id'] == $item['parent']) { + if($item['id'] == $item['parent'] || $r_preview) { $item_object = new Zotlabs\Lib\ThreadItem($item); + $conv->add_thread($item_object); if(($page_mode === 'list') || ($page_mode === 'pager_list')) { $item_object->set_template('conv_list.tpl'); |