summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-05-17 15:54:49 -0400
committerEvan Prodromou <evan@prodromou.name>2008-05-17 15:54:49 -0400
commita0bdc80053ce3b1d908aad6ab4a462b44b504e0c (patch)
treeb2217598ccfd76855e0109d2778db63c08ee5636
parent466f0489c364441c125dffe6c9040bf6fcafd043 (diff)
go to public timeline on logout and handle missing user more gracefully
darcs-hash:20080517195449-84dde-d08f3cad4fb79cdf81ef40f79aa30a29c9ddd9a7.gz
-rw-r--r--actions/logout.php2
-rw-r--r--actions/showstream.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/actions/logout.php b/actions/logout.php
index b2f0628f2..053130b9f 100644
--- 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 45e155fea..c9b35ee0b 100644
--- 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