If there's no Happening, we can't use the RSVP.

[quix0rs-gnu-social.git] / classes / Group_join_queue.php

diff --git a/classes/Group_join_queue.php b/classes/Group_join_queue.php
index 55467d0dd861a9b0ad153ec275fb771ff972bcdc..9ff221c49fcf4b00daff2bed97921253b9185133 100644 (file)
--- a/classes/Group_join_queue.php
+++ b/classes/Group_join_queue.php
@@ -14,10 +14,6 @@ class Group_join_queue extends Managed_DataObject
     public $group_id;
     public $created;
 
-    /* Pkey get */
-    function pkeyGet($k)
-    { return Memcached_DataObject::pkeyGet('Group_join_queue',$k); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
@@ -80,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));
         }
     }