diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-04 06:07:28 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-04 06:07:28 -0800 |
commit | b218aee94e581230e1efa14d4ae1a19756986ddf (patch) | |
tree | a832ddf3b4322b520fd20c4d8ea2d31720c3679b /actions/showgroup.php | |
parent | 358556057a87c0cb9291223a2026782e6548ff2e (diff) | |
parent | 14d7f4a598d0e24467fe3eafd9a02b0e651edad8 (diff) |
Merge commit 'origin/testing' into 0.9.x
Conflicts:
lib/action.php
lib/adminpanelaction.php
Diffstat (limited to 'actions/showgroup.php')
-rw-r--r-- | actions/showgroup.php | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/actions/showgroup.php b/actions/showgroup.php index 4e1fcb6c7..5704b13d1 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -301,19 +301,20 @@ class ShowgroupAction extends GroupDesignAction $this->element('h2', null, _('Group actions')); $this->elementStart('ul'); $this->elementStart('li', 'entity_subscribe'); - $cur = common_current_user(); - if ($cur) { - if ($cur->isMember($this->group)) { - $lf = new LeaveForm($this, $this->group); - $lf->show(); - } else if (!Group_block::isBlocked($this->group, $cur->getProfile())) { - $jf = new JoinForm($this, $this->group); - $jf->show(); + if (Event::handle('StartGroupSubscribe', array($this, $this->group))) { + $cur = common_current_user(); + if ($cur) { + if ($cur->isMember($this->group)) { + $lf = new LeaveForm($this, $this->group); + $lf->show(); + } else if (!Group_block::isBlocked($this->group, $cur->getProfile())) { + $jf = new JoinForm($this, $this->group); + $jf->show(); + } } + Event::handle('EndGroupSubscribe', array($this, $this->group)); } - $this->elementEnd('li'); - $this->elementEnd('ul'); $this->elementEnd('div'); } |