We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 6d9ea620 authored by Chimo's avatar Chimo

Fix group-join request rejections

parent 831e9db7
...@@ -76,20 +76,17 @@ class Group_join_queue extends Managed_DataObject ...@@ -76,20 +76,17 @@ class Group_join_queue extends Managed_DataObject
/** /**
* Abort the pending group join... * Abort the pending group join...
*
* @param User_group $group
*/ */
function abort() function abort()
{ {
$profile = $this->getMember(); $profile = $this->getMember();
$group = $this->getGroup(); $group = $this->getGroup();
if ($request) {
if (Event::handle('StartCancelJoinGroup', array($profile, $group))) { if (Event::handle('StartCancelJoinGroup', array($profile, $group))) {
$this->delete(); $this->delete();
Event::handle('EndCancelJoinGroup', array($profile, $group)); Event::handle('EndCancelJoinGroup', array($profile, $group));
} }
} }
}
/** /**
* Complete a pending group join... * Complete a pending group join...
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment