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 /actions/groupblock.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 'actions/groupblock.php')
| -rw-r--r-- | actions/groupblock.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/groupblock.php b/actions/groupblock.php index fc95c0e66..2e06dc324 100644 --- a/actions/groupblock.php +++ b/actions/groupblock.php @@ -117,7 +117,7 @@ class GroupblockAction extends RedirectingAction parent::handle($args); if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->arg('no')) { - $this->returnToArgs(); + $this->returnToPrevious(); } elseif ($this->arg('yes')) { $this->blockProfile(); } elseif ($this->arg('blockto')) { @@ -195,7 +195,7 @@ class GroupblockAction extends RedirectingAction return false; } - $this->returnToArgs(); + $this->returnToPrevious(); } /** |