Merge pull request #13646 from annando/page-drop

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

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 6cc799eb6b7fceedb43ca806b0ac29a4e028c324..cab5f7a4250ac3a77a96afd5e2e6d530eed02cb4 100644 (file)
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -40,21 +40,21 @@ use Friendica\Network\HTTPException;
 class Nav
 {
        private static $selected = [
-               'global'    => null,
-               'community' => null,
-               'channel'   => null,
-               'network'   => null,
-               'home'      => null,
-               'profiles'  => null,
+               'global'        => null,
+               'community'     => null,
+               'channel'       => null,
+               'network'       => null,
+               'home'          => null,
+               'profiles'      => null,
                'introductions' => null,
                'notifications' => null,
-               'messages'  => null,
-               'directory' => null,
-               'settings'  => null,
-               'contacts'  => null,
-               'delegation' => null,
-               'calendar'  => null,
-               'register'  => null
+               'messages'      => null,
+               'directory'     => null,
+               'settings'      => null,
+               'contacts'      => null,
+               'delegation'    => null,
+               'calendar'      => null,
+               'register'      => null
        ];
 
        /**
@@ -284,14 +284,12 @@ class Nav
                        $gdirpath = Profile::zrl($this->config->get('system', 'directory'), true);
                }
 
-               if ((!$this->session->isAuthenticated() && $this->config->get('system', 'community_page_style') != Community::DISABLED_VISITOR) &&
-                       !($this->config->get('system', 'community_page_style') == Community::DISABLED)
-               ) {
+               if (($this->session->getLocalUserId() || $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')];
                }