diff options
author | Zach Copley <zach@controlyourself.ca> | 2009-04-03 13:24:01 -0700 |
---|---|---|
committer | Zach Copley <zach@controlyourself.ca> | 2009-04-03 13:24:01 -0700 |
commit | 590cc0c9a41206ba58c9333b4e9ef8931285f7e4 (patch) | |
tree | 6b6457534c26890e4d5912bc1afeabd63cf9c0c7 /actions/block.php | |
parent | ab2946047cd08c6b66cbc57410fa8a99430530f6 (diff) | |
parent | 81c72956a615eee04cf3770b4e197dd7fe563357 (diff) |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'actions/block.php')
-rw-r--r-- | actions/block.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/actions/block.php b/actions/block.php index e77b634c8..34f991dc6 100644 --- a/actions/block.php +++ b/actions/block.php @@ -93,7 +93,8 @@ class BlockAction extends Action if ($this->arg('no')) { $cur = common_current_user(); $other = Profile::staticGet('id', $this->arg('blockto')); - common_redirect(common_local_url('showstream', array('nickname' => $other->nickname))); + common_redirect(common_local_url('showstream', array('nickname' => $other->nickname)), + 303); } elseif ($this->arg('yes')) { $this->blockProfile(); } elseif ($this->arg('blockto')) { @@ -102,7 +103,6 @@ class BlockAction extends Action } } - function showContent() { $this->areYouSureForm(); } @@ -110,7 +110,7 @@ class BlockAction extends Action function title() { return _('Block user'); } - + function showNoticeForm() { // nop } @@ -178,10 +178,11 @@ class BlockAction extends Action } if ($action) { - common_redirect(common_local_url($action, $args)); + common_redirect(common_local_url($action, $args), 303); } else { common_redirect(common_local_url('subscriptions', - array('nickname' => $cur->nickname))); + array('nickname' => $cur->nickname)), + 303); } } } |