diff options
| author | friendica <info@friendica.com> | 2012-09-25 17:57:20 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-09-25 17:57:20 -0700 |
| commit | fbafd92f7f7b96b215b98f30de9a1ccbdb3479be (patch) | |
| tree | f1f6739d513ac297fbd14162b8377cc4cf84c784 /include/nav.php | |
| parent | dd5725c2725b742473ce285dce8573da37fb8053 (diff) | |
| download | volse-hubzilla-fbafd92f7f7b96b215b98f30de9a1ccbdb3479be.tar.gz volse-hubzilla-fbafd92f7f7b96b215b98f30de9a1ccbdb3479be.tar.bz2 volse-hubzilla-fbafd92f7f7b96b215b98f30de9a1ccbdb3479be.zip | |
moving a lot of structure around. 'entity' is now 'channel'
Diffstat (limited to 'include/nav.php')
| -rw-r--r-- | include/nav.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/include/nav.php b/include/nav.php index dd2dbe8ab..4c37913c0 100644 --- a/include/nav.php +++ b/include/nav.php @@ -27,7 +27,9 @@ function nav(&$a) { * */ - $myident = ((is_array($a->identity) && isset($a->identity['entity_address'])) ? $a->identity['entity_address'] . '@' : ''); + $channel = $a->get_channel(); + + $myident = ((is_array($channel) && isset($channel['channel_address'])) ? $channel['channel_address'] . '@' : ''); $sitelocation = $myident . substr($a->get_baseurl($ssl_state),strpos($a->get_baseurl($ssl_state),'//') + 2 ); @@ -46,16 +48,16 @@ function nav(&$a) { $nav['logout'] = Array('logout',t('Logout'), "", t('End this session')); // user menu - $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('profile/' . $channel['channel_address'], t('Status'), "", t('Your posts and conversations')); + $nav['usermenu'][] = Array('profile/' . $channel['channel_address']. '?tab=profile', t('Profile'), "", t('Your profile page')); + $nav['usermenu'][] = Array('photos/' . $channel['channel_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->identity['entity_id'])); + $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($channel['channel_id'])); $userinfo = array( 'icon' => $r[0]['micro'], - 'name' => $a->identity['entity_name'], + 'name' => $channel['channel_name'], ); } @@ -111,9 +113,9 @@ function nav(&$a) { $nav['network'] = array('network', t('Network'), "", t('Conversations from your friends')); - $nav['home'] = array('profile/' . $a->identity['entity_address'], t('Home'), "", t('Your posts and conversations')); + $nav['home'] = array('profile/' . $channel['channel_address'], t('Home'), "", t('Your posts and conversations')); - if($a->identity['entity_pageflags'] == PAGE_NORMAL) { + if($channel['channel_pageflags'] == PAGE_NORMAL) { $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'), "", ""); |