]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Fix group-join request rejections
authorChimo <chimo@chromic.org>
Fri, 4 Dec 2015 16:09:51 +0000 (16:09 +0000)
committerChimo <chimo@chromic.org>
Fri, 4 Dec 2015 16:11:15 +0000 (16:11 +0000)
classes/Group_join_queue.php

index 8007552fcff4c6a4e8fcdf980efae29ef7acfa6d..9ff221c49fcf4b00daff2bed97921253b9185133 100644 (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));
         }
     }