]> git.mxchange.org Git - friendica.git/blobdiff - include/nav.php
fixes to cursor
[friendica.git] / include / nav.php
old mode 100755 (executable)
new mode 100644 (file)
index f40e92d..e26cc88
@@ -55,7 +55,7 @@ function nav(&$a) {
                // user info
                $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
                $userinfo = array(
-                       'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl($ssl_state)."/images/person-48.jpg"),
+                       'icon' => (count($r) ? $a->get_cached_avatar_image($r[0]['micro']) : $a->get_baseurl($ssl_state)."/images/person-48.jpg"),
                        'name' => $a->user['username'],
                );
                
@@ -69,7 +69,9 @@ function nav(&$a) {
         * "Home" should also take you home from an authenticated remote profile connection
         */
 
-       $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
+       $homelink = get_my_url();
+       if(! $homelink)
+               $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
 
        if(($a->module != 'home') && (! (local_user()))) 
                $nav['home'] = array($homelink, t('Home'), "", t('Home Page'));
@@ -115,7 +117,7 @@ function nav(&$a) {
 
                /* only show friend requests for normal pages. Other page types have automatic friendship. */
 
-               if($_SESSION['page_flags'] == PAGE_NORMAL) {
+               if($_SESSION['page_flags'] == PAGE_NORMAL || $_SESSION['page_flags'] == PAGE_PRVGROUP) {
                        $nav['introductions'] = array('notifications/intros',   t('Introductions'), "", t('Friend Requests'));
                        $nav['notifications'] = array('notifications',  t('Notifications'), "", t('Notifications'));
                        $nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", "");
@@ -160,6 +162,7 @@ function nav(&$a) {
        $tpl = get_markup_template('nav.tpl');
 
        $a->page['nav'] .= replace_macros($tpl, array(
+        '$baseurl' => $a->get_baseurl(),
                '$langselector' => lang_selector(),
                '$sitelocation' => $sitelocation,
                '$nav' => $nav,