X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnav.php;h=1bc9a3ae1d34ce602154c6d30e2a141e0c173577;hb=05674206ba9a7c70c5e298e3925d95428abff78e;hp=411f0ac5da5c28d1341d9d3e43165b11385b01d3;hpb=9e99066fd70a9dd9a291a523afba1a390f0e3a0b;p=friendica.git

diff --git a/include/nav.php b/include/nav.php
index 411f0ac5da..1bc9a3ae1d 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,6 +1,9 @@
 <?php
-
+/**
+ * @file include/nav.php
+ */
 use Friendica\App;
+use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
@@ -144,10 +147,10 @@ function nav_info(App $a)
 		if (strlen($gdir)) {
 			$gdirpath = zrl($gdir, true);
 		}
-	} elseif (Config::get('system', 'community_page_style') == CP_USERS_ON_SERVER) {
-		$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 (local_user() || Config::get('system', 'community_page_style') != CP_NO_COMMUNITY_PAGE) {
+		$nav['community'] = array('community', t('Community'), '', t('Conversations on this and other servers'));
 	}
 
 	if (local_user()) {
@@ -190,7 +193,7 @@ function nav_info(App $a)
 
 		$nav['settings'] = array('settings', t('Settings'), '', t('Account settings'));
 
-		if (feature_enabled(local_user(), 'multi_profiles')) {
+		if (Feature::isEnabled(local_user(), 'multi_profiles')) {
 			$nav['profiles'] = array('profiles', t('Profiles'), '', t('Manage/Edit Profiles'));
 		}
 
@@ -206,7 +209,7 @@ function nav_info(App $a)
 
 	// Provide a banner/logo/whatever
 	$banner = Config::get('system', 'banner');
-	if ($banner === false) {
+	if (is_null($banner)) {
 		$banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
 	}
 
@@ -227,6 +230,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,