Network, Channels and Community are children of timeline

[friendica.git] / src / Content / Nav.php

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index c6634a95c44439ca0d9575a9e3dff4ea329ab0dd..6cc799eb6b7fceedb43ca806b0ac29a4e028c324 100644 (file)
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -42,6 +42,7 @@ class Nav
        private static $selected = [
                'global'    => null,
                'community' => null,
+               'channel'   => null,
                'network'   => null,
                'home'      => null,
                'profiles'  => null,
@@ -51,7 +52,7 @@ class Nav
                'directory' => null,
                'settings'  => null,
                'contacts'  => null,
-               'delegation'=> null,
+               'delegation' => null,
                'calendar'  => null,
                'register'  => null
        ];
@@ -199,6 +200,7 @@ class Nav
                        'moderation'    => null,
                        'apps'          => null,
                        'community'     => null,
+                       'channel'       => null,
                        'home'          => null,
                        'calendar'      => null,
                        'login'         => null,
@@ -282,12 +284,14 @@ class Nav
                        $gdirpath = Profile::zrl($this->config->get('system', 'directory'), true);
                }
 
-               if (($this->session->getLocalUserId() || $this->config->get('system', 'community_page_style') != Community::DISABLED_VISITOR) &&
-                       !($this->config->get('system', 'community_page_style') == Community::DISABLED)) {
+               if ((!$this->session->isAuthenticated() && $this->config->get('system', 'community_page_style') != Community::DISABLED_VISITOR) &&
+                       !($this->config->get('system', 'community_page_style') == Community::DISABLED)
+               ) {
                        $nav['community'] = ['community', $this->l10n->t('Community'), '', $this->l10n->t('Conversations on this and other servers')];
                }
 
                if ($this->session->getLocalUserId()) {
+                       $nav['channel'] = ['channel', $this->l10n->t('Channels'), '', $this->l10n->t('Current posts, filtered by several rules')];
                        $nav['calendar'] = ['calendar', $this->l10n->t('Calendar'), '', $this->l10n->t('Calendar')];
                }