handle blog_mode in conv template

2 files changed, 13 insertions, 2 deletions

diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 980ba56ee..37a9d3e6d 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -302,6 +302,11 @@ class Channel extends Controller {
 
 		$page_mode = 'client';
 
+		$blog_mode = feature_enabled(local_channel(), 'channel_list_mode') && !$mid;
+		if ($blog_mode) {
+			$page_mode = 'list';
+		}
+
 		$abook_uids = " and abook.abook_channel = " . intval(App::$profile['profile_uid']) . " ";
 
 		$simple_update = '';
@@ -407,7 +412,7 @@ class Channel extends Controller {
 		if ($r) {
 			$parents_str = ids_to_querystr($r, 'item_id');
 
-			$r = items_by_parent_ids($parents_str, blog_mode: (feature_enabled(App::$profile['profile_uid'], 'channel_list_mode') && !$mid));
+			$r = items_by_parent_ids($parents_str, blog_mode: $blog_mode);
 
 			xchan_query($r);
 			$items = fetch_post_tags($r, true);
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 7fa4df456..8dfed2c3a 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -428,6 +428,12 @@ class Network extends \Zotlabs\Web\Controller {
 		$uids = ' and item.uid = ' . local_channel() . ' ';
 
 		$page_mode = 'client';
+
+		$blog_mode = feature_enabled(local_channel(), 'network_list_mode');
+		if ($blog_mode) {
+			$page_mode = 'list';
+		}
+
 		$parents_str = '';
 
 		// This fixes a very subtle bug so I'd better explain it. You wake up in the morning or return after a day
@@ -500,7 +506,7 @@ class Network extends \Zotlabs\Web\Controller {
 			if($r) {
 				$parents_str = ids_to_querystr($r, 'item_id');
 
-				$items = items_by_parent_ids($parents_str, blog_mode: feature_enabled(local_channel(), 'network_list_mode'));
+				$items = items_by_parent_ids($parents_str, blog_mode: $blog_mode);
 
 				xchan_query($items, true);
 				$items = fetch_post_tags($items, true);