Merge commit '5c4a7a10' into nightly

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

diff --git a/classes/Group_join_queue.php b/classes/Group_join_queue.php
index 38473c9b7cb9cbb77b8d055be0302dd83a9049b6..8007552fcff4c6a4e8fcdf980efae29ef7acfa6d 100644 (file)
--- 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,7 +50,7 @@ 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.
@@ -71,7 +63,7 @@ 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.
@@ -104,7 +96,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 +119,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);
     }
 }