summaryrefslogtreecommitdiff
path: root/actions/groupblock.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-05-21 13:12:25 -0700
committerBrion Vibber <brion@pobox.com>2010-05-21 13:12:25 -0700
commit87b8a89aa7b96e63586bdd3b1afb9d43355fd48b (patch)
treeef227ad50cd25699d34dd1a3364ac0cf430443da /actions/groupblock.php
parenta39a934dd4a133bad6e76fa9a5018cedcb70225c (diff)
parentbbfd6eff0c69f038d151d3bf6c8bf9b45a64716f (diff)
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'actions/groupblock.php')
-rw-r--r--actions/groupblock.php4
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();
}
/**