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 b2708d564ce82a41cbb493ad6ceea5dba712cfb0..b30e3b244e8ebdf9f6b1c487c949f77ecabb89e4 100644 (file)
--- a/classes/Profile_block.php
+++ b/classes/Profile_block.php
@@ -54,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));
+    }
 }