Use unified sidebar elements

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index 1d6dc86c3550e73738e42fd03fc5b4a725b1e299..dcaeac8d2dee5514076ff0a2b0a00b85aa180a49 100644 (file)
--- 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()]);