diff options
| author | Max Kostikov <max@kostikov.co> | 2020-12-04 14:33:34 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-12-04 14:33:34 +0100 |
| commit | a9dd6d6bdbc27e11ffe71644670686d82e05420f (patch) | |
| tree | 05dd57d1c3f2a8b7541598544b92dbbfe964c329 /include/conversation.php | |
| parent | c9ce562369556ae01044dfb91541c4e4ee35af9e (diff) | |
| parent | 9c7ec55b4049599f3a61192eaf020e3a112dfa0e (diff) | |
| download | volse-hubzilla-a9dd6d6bdbc27e11ffe71644670686d82e05420f.tar.gz volse-hubzilla-a9dd6d6bdbc27e11ffe71644670686d82e05420f.tar.bz2 volse-hubzilla-a9dd6d6bdbc27e11ffe71644670686d82e05420f.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!2
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'); |