summaryrefslogtreecommitdiff
path: root/actions/showstream.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-14 15:59:35 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-14 15:59:35 -0700
commitbd26a80d45542c6b42f56ecf5472198f4600618b (patch)
tree907b778beb64f86285219276f2444c2626340f2f /actions/showstream.php
parent1c87532912b63effc047da2913e55a6551d8f629 (diff)
parentc2ba727d6154394fe234e9297b430ac69fd24c88 (diff)
Merge branch '0.8.x' into groupblock
Conflicts: lib/router.php
Diffstat (limited to 'actions/showstream.php')
-rw-r--r--actions/showstream.php8
1 files changed, 6 insertions, 2 deletions
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');