diff options
author | Brion Vibber <brion@pobox.com> | 2010-05-21 13:15:08 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-05-21 13:15:08 -0700 |
commit | 6eae5d6a7e2265de4065b764c28cef3ee009bcda (patch) | |
tree | 05cc133095a73fb4e04ad921fbb8ae2a44ff7ba5 /lib/profileformaction.php | |
parent | afd81a540a556ef04bdc326a26268dc82b0dc5f6 (diff) | |
parent | 87b8a89aa7b96e63586bdd3b1afb9d43355fd48b (diff) |
Merge branch 'testing' into 0.9.x
Diffstat (limited to 'lib/profileformaction.php')
-rw-r--r-- | lib/profileformaction.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/profileformaction.php b/lib/profileformaction.php index 0ffafe5fb..51c89a922 100644 --- a/lib/profileformaction.php +++ b/lib/profileformaction.php @@ -60,7 +60,16 @@ class ProfileFormAction extends RedirectingAction $this->checkSessionToken(); if (!common_logged_in()) { - $this->clientError(_('Not logged in.')); + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + $this->clientError(_('Not logged in.')); + } else { + // Redirect to login. + common_set_returnto($this->selfUrl()); + $user = common_current_user(); + if (Event::handle('RedirectToLogin', array($this, $user))) { + common_redirect(common_local_url('login'), 303); + } + } return false; } @@ -97,7 +106,7 @@ class ProfileFormAction extends RedirectingAction if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost(); - $this->returnToArgs(); + $this->returnToPrevious(); } } |