diff options
author | Brion Vibber <brion@pobox.com> | 2010-02-26 09:35:28 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-02-26 09:35:28 -0800 |
commit | 8dfc8f1635940b096e7f4025e3aef0ca4f909eb2 (patch) | |
tree | 9fce4aa765d56496031698f219da2f0f82b33e80 /plugins/OStatus/actions/ostatussub.php | |
parent | 8914b69d5055c1bc7d0604ee338ffdaf6b0a8606 (diff) | |
parent | b331e971b055386a126aaec27d661f26ba3b813c (diff) |
Merge branch 'testing' into 0.9.x
Diffstat (limited to 'plugins/OStatus/actions/ostatussub.php')
-rw-r--r-- | plugins/OStatus/actions/ostatussub.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php index 12832cdcf..aae22f868 100644 --- a/plugins/OStatus/actions/ostatussub.php +++ b/plugins/OStatus/actions/ostatussub.php @@ -333,10 +333,18 @@ class OStatusSubAction extends Action $group = $this->oprofile->localGroup(); if ($user->isMember($group)) { $this->showForm(_m('Already a member!')); - } elseif (Group_member::join($this->oprofile->group_id, $user->id)) { - $this->successGroup(); + return; + } + if (Event::handle('StartJoinGroup', array($group, $user))) { + $ok = Group_member::join($this->oprofile->group_id, $user->id); + if ($ok) { + Event::handle('EndJoinGroup', array($group, $user)); + $this->successGroup(); + } else { + $this->showForm(_m('Remote group join failed!')); + } } else { - $this->showForm(_m('Remote group join failed!')); + $this->showForm(_m('Remote group join aborted!')); } } else { $local = $this->oprofile->localProfile(); |