diff options
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Lib/ThreadStream.php | 4 | ||||
| -rw-r--r-- | include/conversation.php | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 315e30668..2c66aa785 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -80,7 +80,7 @@ class ThreadItem { * _ false on failure */ - public function get_template_data($conv_responses, $mid_uuid_map, $blog_mode, $thread_level=1, $conv_flags = []) { + public function get_template_data($conv_responses, $mid_uuid_map, $thread_level=1, $conv_flags = []) { $result = []; $item = $this->get_data(); @@ -484,7 +484,7 @@ class ThreadItem { 'attendmaybe' => intval($item['observer_tentativelyaccepted'] ?? 0) ], 'threaded' => $this->threaded, - 'blog_mode' => $blog_mode + 'blog_mode' => $this->get_display_mode() === 'list' ); $arr = array('item' => $item, 'output' => $tmp_item); @@ -499,7 +499,7 @@ class ThreadItem { if(($this->get_display_mode() === 'normal') && ($nb_children > 0)) { foreach($children as $child) { - $result['children'][] = $child->get_template_data($conv_responses, $mid_uuid_map, $blog_mode, $thread_level + 1, $conv_flags); + $result['children'][] = $child->get_template_data($conv_responses, $mid_uuid_map, $thread_level + 1, $conv_flags); } // Collapse diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php index 807cf9786..fb3b6dd9b 100644 --- a/Zotlabs/Lib/ThreadStream.php +++ b/Zotlabs/Lib/ThreadStream.php @@ -211,7 +211,7 @@ class ThreadStream { * _ The data requested on success * _ false on failure */ - public function get_template_data($conv_responses, $mid_uuid_map, $blog_mode) { + public function get_template_data($conv_responses, $mid_uuid_map) { $result = array(); foreach($this->threads as $item) { @@ -220,7 +220,7 @@ class ThreadStream { $item_data = $this->prepared_item; } else { - $item_data = $item->get_template_data($conv_responses, $mid_uuid_map, $blog_mode); + $item_data = $item->get_template_data($conv_responses, $mid_uuid_map); } if(!$item_data) { logger('Failed to get item template data ('. $item->get_id() .').', LOGGER_DEBUG, LOG_ERR); diff --git a/include/conversation.php b/include/conversation.php index 84aa28ced..b81c6e5d9 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -728,9 +728,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa } } - $blog_mode = $page_mode === 'list'; - - $threads = $conv->get_template_data($conv_responses, $mid_uuid_map, $blog_mode); + $threads = $conv->get_template_data($conv_responses, $mid_uuid_map); if(!$threads) { logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG); $threads = array(); |