We now have a global page for all global entries from the network.

[friendica.git] / include / nav.php

diff --git a/include/nav.php b/include/nav.php
index 58ec150e7ad21bbbdbadaee68240e908b8f92ae6..3a32c8e7d8c5c11b4a50e370509b7f733d98a2c5 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -147,10 +147,14 @@ function nav_info(App $a)
                if (strlen($gdir)) {
                        $gdirpath = zrl($gdir, true);
                }
-       } elseif (Config::get('system', 'community_page_style') == CP_USERS_ON_SERVER) {
+       }
+
+       if (in_array(Config::get('system', 'community_page_style'), [CP_USERS_ON_SERVER, CP_USERS_AND_GLOBAL])) {
                $nav['community'] = array('community', t('Community'), '', t('Conversations on this site'));
-       } elseif (Config::get('system', 'community_page_style') == CP_GLOBAL_COMMUNITY) {
-               $nav['community'] = array('community', t('Community'), '', t('Conversations on the network'));
+       }
+
+       if (in_array(Config::get('system', 'community_page_style'), [CP_GLOBAL_COMMUNITY, CP_USERS_AND_GLOBAL])) {
+               $nav['global'] = array('global', t('Global Timeline'), '', t('Conversations on the network'));
        }
 
        if (local_user()) {
@@ -230,6 +234,7 @@ function nav_info(App $a)
 function nav_set_selected($item){
        $a = get_app();
        $a->nav_sel = array(
+               'global'        => null,
                'community'     => null,
                'network'       => null,
                'home'          => null,