diff options
| -rw-r--r-- | actions/public.php | 3 | ||||
| -rw-r--r-- | lib/stream.php | 15 |
2 files changed, 9 insertions, 9 deletions
diff --git a/actions/public.php b/actions/public.php index 763f278bd..7e47b9f75 100644 --- a/actions/public.php +++ b/actions/public.php @@ -40,12 +40,9 @@ class PublicAction extends StreamAction { } function show_top() { - if (common_logged_in()) { common_notice_form(); } - - $this->views_menu(); } function show_header() { diff --git a/lib/stream.php b/lib/stream.php index 2e22b3576..4ffe27d3c 100644 --- a/lib/stream.php +++ b/lib/stream.php @@ -28,23 +28,26 @@ class StreamAction extends Action { } function views_menu() { + + $user = NULL; $action = $this->trimmed('action'); $nickname = $this->trimmed('nickname'); + + if ($nickname) { + $user = User::staticGet('nickname', $nickname); + } common_element_start('ul', array('id' => 'nav_views')); - common_menu_item(common_local_url('public'), - _t('Public'), - _t('Public stream'), - $action == 'public'); + common_menu_item(common_local_url('all', array('nickname' => $nickname)), _t('Personal'), - (($user->fullname) ? $user->fullname : $nickname) . _t(' and friends'), + (($user && $user->fullname) ? $user->fullname : $nickname) . _t(' and friends'), $action == 'all'); common_menu_item(common_local_url('showstream', array('nickname' => $nickname)), _t('Profile'), - ($user->fullname) ? $user->fullname : $nickname, + ($user && $user->fullname) ? $user->fullname : $nickname, $action == 'showstream'); common_element_end('ul'); } |