X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Fnav.php;h=5c2d6efa0edf431ba8627b93c538386a24a805b8;hb=0fe832ef8aeafa1ddba793a8b084005cf070f1f4;hp=58ec150e7ad21bbbdbadaee68240e908b8f92ae6;hpb=311af3e544c7cfa247bd9f2bf374f9017e438ec7;p=friendica.git

diff --git a/include/nav.php b/include/nav.php
index 58ec150e7a..5c2d6efa0e 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -7,6 +7,7 @@ use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Profile;
 
 function nav(App $a) {
 
@@ -94,9 +95,9 @@ function nav_info(App $a)
 		$nav['usermenu'][] = array('notes/', t('Personal notes'), '', t('Your personal notes'));
 
 		// user info
-		$r = dba::select('contact', array('micro'), array('uid' => $a->user['uid'], 'self' => true), array('limit' => 1));
+		$contact = dba::selectFirst('contact', ['micro'], ['uid' => $a->user['uid'], 'self' => true]);
 		$userinfo = array(
-			'icon' => (DBM::is_result($r) ? $a->remove_baseurl($r['micro']) : 'images/person-48.jpg'),
+			'icon' => (DBM::is_result($contact) ? $a->remove_baseurl($contact['micro']) : 'images/person-48.jpg'),
 			'name' => $a->user['username'],
 		);
 	} else {
@@ -104,9 +105,9 @@ function nav_info(App $a)
 	}
 
 	// "Home" should also take you home from an authenticated remote profile connection
-	$homelink = get_my_url();
+	$homelink = Profile::getMyURL();
 	if (! $homelink) {
-		$homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
+		$homelink = ((x($_SESSION, 'visitor_home')) ? $_SESSION['visitor_home'] : '');
 	}
 
 	if (($a->module != 'home') && (! (local_user()))) {
@@ -145,12 +146,12 @@ function nav_info(App $a)
 	if (strlen(Config::get('system', 'singleuser'))) {
 		$gdir = Config::get('system', 'directory');
 		if (strlen($gdir)) {
-			$gdirpath = zrl($gdir, true);
+			$gdirpath = Profile::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()) {
@@ -230,6 +231,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,