Some more documentation

[friendica.git] / include / nav.php

diff --git a/include/nav.php b/include/nav.php
index 7fa9754ef15f0e4a8e4b000c6a5ae0b4bfd1d442..0fa671a27d5118a384aebbaf69945dd265f8772b 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -27,7 +27,6 @@ function nav(&$a) {
 
        $a->page['nav'] .= replace_macros($tpl, array(
                '$baseurl' => $a->get_baseurl(),
-               '$langselector' => lang_selector(),
                '$sitelocation' => $nav_info['sitelocation'],
                '$nav' => $nav_info['nav'],
                '$banner' =>  $nav_info['banner'],
@@ -48,7 +47,7 @@ function nav_info(&$a) {
 
        /**
         *
-        * Our network is distributed, and as you visit friends some of the 
+        * Our network is distributed, and as you visit friends some of the
         * sites look exactly the same - it isn't always easy to know where you are.
         * Display the current site location as a navigation aid.
         *
@@ -83,7 +82,7 @@ function nav_info(&$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->get_cached_avatar_image($r[0]['micro']) : $a->get_baseurl($ssl_state)."/images/person-48.jpg"),
+                       'icon' => (count($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg"),
                        'name' => $a->user['username'],
                );
 
@@ -108,7 +107,7 @@ function nav_info(&$a) {
        if(($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user()))
                $nav['register'] = array('register',t('Register'), "", t('Create an account'));
 
-       $help_url = $a->get_baseurl($ssl_state) . '/help';
+       $help_url = 'help';
 
        if(! get_config('system','hide_help'))
                $nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'));
@@ -207,7 +206,7 @@ function nav_info(&$a) {
 
        $banner = get_config('system','banner');
 
-       if($banner === false) 
+       if($banner === false)
                $banner .= '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
 
        call_hooks('nav_info', $nav);
@@ -224,7 +223,7 @@ function nav_info(&$a) {
 
 /*
  * Set a menu item in navbar as selected
- * 
+ *
  */
 function nav_set_selected($item){
        $a = get_app();