summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-03-03 12:10:48 -0800
committerZach Copley <zach@status.net>2010-03-03 12:10:48 -0800
commit82ea0f7884d291f11964d5a54dbf8194ce24cb58 (patch)
tree2f4b56b50ec13704ba02f18b3ce91e5c5a16666e
parent2f167f2663b2731d9f5d21bb9893aebff4dcf6f0 (diff)
parentc82efb7fd8ba28b854020821246878fc0a8cec2b (diff)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline: subscribers list wasn't firing correct events
-rw-r--r--actions/subscribers.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/actions/subscribers.php b/actions/subscribers.php
index cd3e2ee5b..4bced6284 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -143,9 +143,12 @@ class SubscribersListItem extends SubscriptionListItem
function showActions()
{
$this->startActions();
- $this->showSubscribeButton();
- // Relevant code!
- $this->showBlockForm();
+ if (Event::handle('StartProfileListItemActionElements', array($this))) {
+ $this->showSubscribeButton();
+ // Relevant code!
+ $this->showBlockForm();
+ Event::handle('EndProfileListItemActionElements', array($this));
+ }
$this->endActions();
}