take out public from views menu for now

darcs-hash:20080614122517-84dde-c78fbdd9c3329e87f405040e851650a81ab63d5c.gz

diff --git a/actions/public.php b/actions/public.php
index 763f278bdf75818d784a2e5f67abc5517249bbc5..7e47b9f759935bb5a3ac17c73f2fe154d0e00d5a 100644 (file)
--- 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 2e22b357670fc2119fc791d2c5a83b191655641c..4ffe27d3cab3231f50dcc441eb5023396a3b3b0a 100644 (file)
--- 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');
        }