diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-14 15:59:35 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-14 15:59:35 -0700 |
| commit | bd26a80d45542c6b42f56ecf5472198f4600618b (patch) | |
| tree | 907b778beb64f86285219276f2444c2626340f2f /actions | |
| parent | 1c87532912b63effc047da2913e55a6551d8f629 (diff) | |
| parent | c2ba727d6154394fe234e9297b430ac69fd24c88 (diff) | |
Merge branch '0.8.x' into groupblock
Conflicts:
lib/router.php
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/block.php | 2 | ||||
| -rw-r--r-- | actions/showstream.php | 8 | ||||
| -rw-r--r-- | actions/unblock.php | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/actions/block.php b/actions/block.php index 34f991dc6..0efee5932 100644 --- a/actions/block.php +++ b/actions/block.php @@ -180,7 +180,7 @@ class BlockAction extends Action if ($action) { common_redirect(common_local_url($action, $args), 303); } else { - common_redirect(common_local_url('subscriptions', + common_redirect(common_local_url('subscribers', array('nickname' => $cur->nickname)), 303); } diff --git a/actions/showstream.php b/actions/showstream.php index e2f4e24d4..72316b259 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -320,10 +320,14 @@ class ShowstreamAction extends ProfileAction $blocked = $cur->hasBlocked($this->profile); $this->elementStart('li', 'entity_block'); if ($blocked) { - $ubf = new UnblockForm($this, $this->profile); + $ubf = new UnblockForm($this, $this->profile, + array('action' => 'showstream', + 'nickname' => $this->profile->nickname)); $ubf->show(); } else { - $bf = new BlockForm($this, $this->profile); + $bf = new BlockForm($this, $this->profile, + array('action' => 'showstream', + 'nickname' => $this->profile->nickname)); $bf->show(); } $this->elementEnd('li'); diff --git a/actions/unblock.php b/actions/unblock.php index 8573b2a87..6e671c9dd 100644 --- a/actions/unblock.php +++ b/actions/unblock.php @@ -118,7 +118,7 @@ class UnblockAction extends Action if ($action) { common_redirect(common_local_url($action, $args), 303); } else { - common_redirect(common_local_url('subscriptions', + common_redirect(common_local_url('subscribers', array('nickname' => $cur->nickname)), 303); } |