From 371309e775c03cbcde2731881f05e3d1be394bd9 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 17 Sep 2023 10:09:07 +0000 Subject: [PATCH] Use unified sidebar elements --- src/Module/Conversation/Network.php | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index 1d6dc86c35..dcaeac8d2d 100644 --- a/src/Module/Conversation/Network.php +++ b/src/Module/Conversation/Network.php @@ -130,32 +130,28 @@ class Network extends Timeline $this->page['aside'] .= $this->getNoSharerWidget($module); } - if (Feature::isEnabled($this->session->getLocalUserId(), 'trending_tags')) { - $this->page['aside'] .= TrendingTags::getHTML($this->selectedTab); - } - $items = $this->getChannelItems(); } elseif ($this->timeline->isCommunity($this->selectedTab)) { if ($this->session->getLocalUserId() && $this->config->get('system', 'community_no_sharer')) { $this->page['aside'] .= $this->getNoSharerWidget($module); } - if (Feature::isEnabled($this->session->getLocalUserId(), 'trending_tags')) { - $this->page['aside'] .= TrendingTags::getHTML($this->selectedTab); - } - $items = $this->getCommunityItems(); } else { - $this->page['aside'] .= Circle::sidebarWidget($module, $module . '/circle', 'standard', $this->circleId); - $this->page['aside'] .= GroupManager::widget($module . '/group', $this->session->getLocalUserId(), $this->groupContactId); - $this->page['aside'] .= Widget::postedByYear($module . '/archive', $this->session->getLocalUserId(), false); - $this->page['aside'] .= Widget::networks($module, !$this->groupContactId ? $this->network : ''); - $this->page['aside'] .= Widget\SavedSearches::getHTML($this->args->getQueryString()); - $this->page['aside'] .= Widget::fileAs('filed', ''); - $items = $this->getItems(); } + $this->page['aside'] .= Circle::sidebarWidget($module, $module . '/circle', 'standard', $this->circleId); + $this->page['aside'] .= GroupManager::widget($module . '/group', $this->session->getLocalUserId(), $this->groupContactId); + $this->page['aside'] .= Widget::postedByYear($module . '/archive', $this->session->getLocalUserId(), false); + $this->page['aside'] .= Widget::networks($module, !$this->groupContactId ? $this->network : ''); + $this->page['aside'] .= Widget\SavedSearches::getHTML($this->args->getQueryString()); + $this->page['aside'] .= Widget::fileAs('filed', ''); + + if (Feature::isEnabled($this->session->getLocalUserId(), 'trending_tags')) { + $this->page['aside'] .= TrendingTags::getHTML($this->selectedTab); + } + if ($this->pConfig->get($this->session->getLocalUserId(), 'system', 'infinite_scroll') && ($_GET['mode'] ?? '') != 'minimal') { $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl'); $o .= Renderer::replaceMacros($tpl, ['$reload_uri' => $this->args->getQueryString()]);