X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FGroup_join_queue.php;h=9ff221c49fcf4b00daff2bed97921253b9185133;hb=cb8bf360c42ca8fce44fac62316d6d71d66d912e;hp=acf3a13957408ff4ac59db6cfdf0aab4594f2af1;hpb=e862dcdb8a9cfc21cf00513d76f40d20dd3b1b7a;p=quix0rs-gnu-social.git

diff --git a/classes/Group_join_queue.php b/classes/Group_join_queue.php
index acf3a13957..9ff221c49f 100644
--- a/classes/Group_join_queue.php
+++ b/classes/Group_join_queue.php
@@ -14,14 +14,6 @@ class Group_join_queue extends Managed_DataObject
     public $group_id;
     public $created;
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Group_join_queue',$k,$v); }
-
-    /* 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
 
@@ -58,12 +50,12 @@ class Group_join_queue extends Managed_DataObject
 
     function getMember()
     {
-        $member = Profile::staticGet('id', $this->profile_id);
+        $member = Profile::getKV('id', $this->profile_id);
 
         if (empty($member)) {
             // TRANS: Exception thrown providing an invalid profile ID.
             // TRANS: %s is the invalid profile ID.
-            throw new Exception(sprintf(_("Profile ID %s is invalid."),$this->profile_id));
+            throw new Exception(sprintf(_('Profile ID %s is invalid.'),$this->profile_id));
         }
 
         return $member;
@@ -71,12 +63,12 @@ class Group_join_queue extends Managed_DataObject
 
     function getGroup()
     {
-        $group  = User_group::staticGet('id', $this->group_id);
+        $group  = User_group::getKV('id', $this->group_id);
 
         if (empty($group)) {
             // TRANS: Exception thrown providing an invalid group ID.
             // TRANS: %s is the invalid group ID.
-            throw new Exception(sprintf(_("Group ID %s is invalid."),$this->group_id));
+            throw new Exception(sprintf(_('Group ID %s is invalid.'),$this->group_id));
         }
 
         return $group;
@@ -84,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));
         }
     }
 
@@ -104,7 +93,7 @@ class Group_join_queue extends Managed_DataObject
      *
      * @return Group_member object on success
      */
-    function complete(User_group $group)
+    function complete()
     {
         $join = null;
         $profile = $this->getMember();
@@ -127,8 +116,8 @@ class Group_join_queue extends Managed_DataObject
      */
     public function notify()
     {
-        $joiner = Profile::staticGet('id', $this->profile_id);
-        $group = User_group::staticGet('id', $this->group_id);
+        $joiner = Profile::getKV('id', $this->profile_id);
+        $group = User_group::getKV('id', $this->group_id);
         mail_notify_group_join_pending($group, $joiner);
     }
 }