diff options
author | Brion Vibber <brion@pobox.com> | 2010-05-20 12:46:36 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-05-20 14:24:44 -0700 |
commit | 68305d4b6848cec6afe887ee2a5735515060770e (patch) | |
tree | 78f0afc0f55aa0900ef7b7454e6bf2f692553475 /lib/redirectingaction.php | |
parent | 708d22848ecffdb80ca2cd9e5f4a7f84d5ae3189 (diff) |
Added block link to subscription notification emails; block action can now take a profile ID on the URL; added profile details to block page so there's an indication of who you're blocking before you pull the trigger.
Fixed typo in RedirectingAction when no return-to data provided in form submission.
RedirectingAction::returnToArgs() has been renamed to returnToPrevious() to avoid conflict with Action::returnToArgs() which returns arguments to be passed to other actions as return-to arguments. All callers should now be updated.
More profile settings actions will now redirect through a login form if visited as a GET request, as would be expected from a bookmark, link sent in e-mail etc.
Diffstat (limited to 'lib/redirectingaction.php')
-rw-r--r-- | lib/redirectingaction.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/redirectingaction.php b/lib/redirectingaction.php index f11585274..3a358f891 100644 --- a/lib/redirectingaction.php +++ b/lib/redirectingaction.php @@ -53,12 +53,13 @@ class RedirectingAction extends Action * * To be called only after successful processing. * - * @fixme rename this -- it obscures Action::returnToArgs() which - * returns a list of arguments, and is a bit confusing. + * Note: this was named returnToArgs() up through 0.9.2, which + * caused problems because there's an Action::returnToArgs() + * already which does something different. * * @return void */ - function returnToArgs() + function returnToPrevious() { // Now, gotta figure where we go back to $action = false; @@ -77,7 +78,7 @@ class RedirectingAction extends Action if ($action) { common_redirect(common_local_url($action, $args, $params), 303); } else { - $url = $this->defaultReturnToUrl(); + $url = $this->defaultReturnTo(); } common_redirect($url, 303); } |