From: mmn <mmn@hethane.se>
Date: Mon, 14 Dec 2015 20:48:18 +0000 (+0000)
Subject: Merge branch 'group-join-rejections' into 'nightly'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2dd968f94e7196d8524ef4dd371173c11e77a9de;hp=d5d806863240379fe23e081c75097ddee53babec;p=quix0rs-gnu-social.git

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

Fix group-join request rejections

Relates to #105

See merge request !65
---

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));
         }
     }