X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnav.php;h=bd933929d3b6b78ee7e8a3113558cd965e3d152d;hb=84b733e1bf25bdd1074483f19113add7800a6c38;hp=7a8230cc15da8f4bc6b9f6a6c7d0cb9479b82c0b;hpb=967ecb42053dd5bd2b7d66435641ae865c54066b;p=friendica.git

diff --git a/include/nav.php b/include/nav.php
index 7a8230cc15..bd933929d3 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,6 +1,6 @@
 <?php
 
-function nav(&$a) {
+function nav(App &$a) {
 
 	/*
 	 *
@@ -28,7 +28,7 @@ function nav(&$a) {
 	$tpl = get_markup_template('nav.tpl');
 
 	$a->page['nav'] .= replace_macros($tpl, array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$sitelocation' => $nav_info['sitelocation'],
 		'$nav' => $nav_info['nav'],
 		'$banner' => $nav_info['banner'],
@@ -65,7 +65,7 @@ function nav_info(App $a)
 
 	$myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
 
-	$sitelocation = $myident . substr($a->get_baseurl($ssl_state), strpos($a->get_baseurl($ssl_state), '//') + 2 );
+	$sitelocation = $myident . substr(App::get_baseurl($ssl_state), strpos(App::get_baseurl($ssl_state), '//') + 2 );
 
 	// nav links: array of array('href', 'text', 'extra css classes', 'title')
 	$nav = array();
@@ -88,7 +88,7 @@ function nav_info(App $a)
 		// user info
 		$r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self` = 1", intval($a->user['uid']));
 		$userinfo = array(
-			'icon' => (count($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg'),
+			'icon' => (dbm::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg'),
 			'name' => $a->user['username'],
 		);
 	} else {