aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-09-04 19:49:29 -0700
committerfriendica <info@friendica.com>2012-09-04 19:49:29 -0700
commita08666be142c484134c2f10cf0c460c8a3c07682 (patch)
tree68a730081f8d0fcacf966a5d088c4180e67b344a /include
parent576559fd02bb12cbba53c11cec4a89f70ff7a132 (diff)
downloadvolse-hubzilla-a08666be142c484134c2f10cf0c460c8a3c07682.tar.gz
volse-hubzilla-a08666be142c484134c2f10cf0c460c8a3c07682.tar.bz2
volse-hubzilla-a08666be142c484134c2f10cf0c460c8a3c07682.zip
unbreak some more stuff
Diffstat (limited to 'include')
-rw-r--r--include/nav.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/nav.php b/include/nav.php
index b837b42d5..dd2dbe8ab 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -46,15 +46,15 @@ function nav(&$a) {
$nav['logout'] = Array('logout',t('Logout'), "", t('End this session'));
// user menu
- $nav['usermenu'][] = Array('profile/' . $a->user['nickname'], t('Status'), "", t('Your posts and conversations'));
- $nav['usermenu'][] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
- $nav['usermenu'][] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
+ $nav['usermenu'][] = Array('profile/' . $a->identity['entity_address'], t('Status'), "", t('Your posts and conversations'));
+ $nav['usermenu'][] = Array('profile/' . $a->identity['entity_address']. '?tab=profile', t('Profile'), "", t('Your profile page'));
+ $nav['usermenu'][] = Array('photos/' . $a->identity['entity_address'], t('Photos'), "", t('Your photos'));
$nav['usermenu'][] = Array('events/', t('Events'), "", t('Your events'));
// user info
- $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->entity['entity_id']));
+ $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->identity['entity_id']));
$userinfo = array(
- 'icon' => $a->get_baseurl($ssl_state). $r[0]['micro'],
+ 'icon' => $r[0]['micro'],
'name' => $a->identity['entity_name'],
);
@@ -111,7 +111,7 @@ function nav(&$a) {
$nav['network'] = array('network', t('Network'), "", t('Conversations from your friends'));
- $nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
+ $nav['home'] = array('profile/' . $a->identity['entity_address'], t('Home'), "", t('Your posts and conversations'));
if($a->identity['entity_pageflags'] == PAGE_NORMAL) {
$nav['introductions'] = array('notifications/intros', t('Introductions'), "", t('Friend Requests'));