From 6d9ea620a3717921f8ad96b76a3e45afba4977db Mon Sep 17 00:00:00 2001
From: Chimo <chimo@chromic.org>
Date: Fri, 4 Dec 2015 16:09:51 +0000
Subject: [PATCH] Fix group-join request rejections

---
 classes/Group_join_queue.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/classes/Group_join_queue.php b/classes/Group_join_queue.php
index 8007552fcf..9ff221c49f 100644
--- a/classes/Group_join_queue.php
+++ b/classes/Group_join_queue.php
@@ -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));
         }
     }
 
-- 
2.39.5