aboutsummaryrefslogtreecommitdiffstats
path: root/include/nav.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-06-23 12:50:00 +0200
committerMichael Vogel <icarus@dabo.de>2012-06-23 12:50:00 +0200
commita81af2e042ae133bec3097488feeaa1318dc798b (patch)
tree25d2103fb3ce9edf45c0f7d1142b5cd3f63f8591 /include/nav.php
parent7a4ad4564dc4fa49aa860a10949ffe8958305f3a (diff)
parentbf47bf5ba015a844919362a56903eb82c064bee9 (diff)
downloadvolse-hubzilla-a81af2e042ae133bec3097488feeaa1318dc798b.tar.gz
volse-hubzilla-a81af2e042ae133bec3097488feeaa1318dc798b.tar.bz2
volse-hubzilla-a81af2e042ae133bec3097488feeaa1318dc798b.zip
Merge remote branch 'upstream/master'
Conflicts: include/bb2diaspora.php
Diffstat (limited to 'include/nav.php')
-rw-r--r--include/nav.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/nav.php b/include/nav.php
index d760cc8ae..a67a8b614 100644
--- 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'],
);