wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'group-join-rejections' into 'nightly'

Browse Source 
Fix group-join request rejections

Relates to #105 

See merge request !65
This commit is contained in:
mmn 2015-12-14 20:48:18 +00:00
commit 2dd968f94e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
classes/Group_join_queue.php
View File

@ -76,18 +76,15 @@ class Group_join_queue extends Managed_DataObject
/**
* Abort the pending group join...
*
* @param User_group $group
*/
function abort()
{
$profile = $this->getMember();
$group = $this->getGroup();
if ($request) {
if (Event::handle('StartCancelJoinGroup', array($profile, $group))) {
$this->delete();
Event::handle('EndCancelJoinGroup', array($profile, $group));
}
if (Event::handle('StartCancelJoinGroup', array($profile, $group))) {
$this->delete();
Event::handle('EndCancelJoinGroup', array($profile, $group));
}
}