From 2fcae93272eb2d4e432c60cc4f5fd7f70c9d9f22 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 14 Jun 2008 08:25:17 -0400 Subject: take out public from views menu for now darcs-hash:20080614122517-84dde-c78fbdd9c3329e87f405040e851650a81ab63d5c.gz --- lib/stream.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'lib/stream.php') 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'); } -- cgit v1.2.3-54-g00ecf