diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-03-23 10:03:54 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-03-23 10:03:54 +0100 |
| commit | 376091010f0c4613c76e30d81285c5c5f54f56d5 (patch) | |
| tree | 6a61747e2ba53c507488d87e33bda6eba7ab84ef /include/conversation.php | |
| parent | ac967db4e87761c1be98d6f548ecedd55d942fea (diff) | |
| parent | af8cbf000fb1433b7c7d2c6c4543980f01ba69a9 (diff) | |
| download | volse-hubzilla-376091010f0c4613c76e30d81285c5c5f54f56d5.tar.gz volse-hubzilla-376091010f0c4613c76e30d81285c5c5f54f56d5.tar.bz2 volse-hubzilla-376091010f0c4613c76e30d81285c5c5f54f56d5.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index 6374267eb..64beb1b0e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -838,11 +838,11 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa $item_object = new Zotlabs\Lib\ThreadItem($item); $conv->add_thread($item_object); - if($page_mode === 'list') { + if(($page_mode === 'list') || ($page_mode === 'pager_list')) { $item_object->set_template('conv_list.tpl'); $item_object->set_display_mode('list'); } - if($page_mode === 'cards') { + if($mode === 'cards' || $mode === 'articles') { $item_object->set_reload($jsreload); } @@ -857,7 +857,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa } } - if($page_mode === 'traditional' || $page_mode === 'preview') { + if(in_array($page_mode, [ 'traditional', 'preview', 'pager_list'] )) { $page_template = get_markup_template("threaded_conversation.tpl"); } elseif($update) { |