Merge branch 'master' of git://github.com/friendica/friendica

[friendica.git] / include / nav.php

diff --git a/include/nav.php b/include/nav.php
index d760cc8ae5bd7f6cab5614ff04a2db3800cce5d6..e26cc8889a916ebae6d1c807a6651e3e6540cd8e 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -53,9 +53,9 @@ function nav(&$a) {
                $nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
                
                // user info
-               $r = q("SELECT `micro`,`avatar-date` FROM `contact` WHERE uid=%d AND self=1", intval($a->user['uid']));
+               $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
                $userinfo = array(
-                       'icon' => (count($r) ? $r[0]['micro']."?rev=".urlencode($r[0]['avatar-date']): $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'],
                );
                
@@ -162,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,