summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-06-14 08:25:17 -0400
committerEvan Prodromou <evan@prodromou.name>2008-06-14 08:25:17 -0400
commit2fcae93272eb2d4e432c60cc4f5fd7f70c9d9f22 (patch)
tree72aaf014ceff81ec59997424d97c6650e147b594
parent52205fc6be6560d97aa8f3dc99da597498cc182e (diff)
take out public from views menu for now
darcs-hash:20080614122517-84dde-c78fbdd9c3329e87f405040e851650a81ab63d5c.gz
-rw-r--r--actions/public.php3
-rw-r--r--lib/stream.php15
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');
}