go to public timeline on logout and handle missing user more gracefully

darcs-hash:20080517195449-84dde-d08f3cad4fb79cdf81ef40f79aa30a29c9ddd9a7.gz

diff --git a/actions/logout.php b/actions/logout.php
index b2f0628f219508f07fa7d826291b044621c6956e..053130b9f7a86e02311f51789ce40538cc18b916 100644 (file)
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -26,7 +26,7 @@ class LogoutAction extends Action {
                        common_user_error(_t('Not logged in.'));
                } else {
                        common_set_user(NULL);
-                       common_redirect(common_local_url('main'));
+                       common_redirect(common_local_url('public'));
                }
        }
 }

diff --git a/actions/showstream.php b/actions/showstream.php
index 45e155feab9d9a46c3b0fed33479b1a60de031b7..c9b35ee0bbb4bc297e0733ea4f9e7173ec944846 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -35,12 +35,14 @@ class ShowstreamAction extends StreamAction {
 
                if (!$user) {
                        $this->no_such_user();
+                       return;
                }
 
                $profile = $user->getProfile();
 
                if (!$profile) {
                        common_server_error(_t('User record exists without profile.'));
+                       return;                 
                }
 
                # Looks like we're good; show the header