Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/classes/Profile_block.php b/classes/Profile_block.php
index 85062834629f1665e2aefec216b8fa85eef814ff..b30e3b244e8ebdf9f6b1c487c949f77ecabb89e4 100644 (file)
--- a/classes/Profile_block.php
+++ b/classes/Profile_block.php
@@ -35,10 +35,6 @@ class Profile_block extends Managed_DataObject
     public $blocked;                         // int(4)  primary_key not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Profile_block',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
@@ -58,10 +54,9 @@ class Profile_block extends Managed_DataObject
         );
     }
 
-    function get($blocker, $blocked)
+    static function exists(Profile $blocker, Profile $blocked)
     {
-        return Memcached_DataObject::pkeyGet('Profile_block',
-                                             array('blocker' => $blocker,
-                                                   'blocked' => $blocked));
-     }
+        return Profile_block::pkeyGet(array('blocker' => $blocker->id,
+                                            'blocked' => $blocked->id));
+    }
 }