removed Profile_block::get, changed to use pkeyGet

darcs-hash:20081209041227-5ed1f-2edefdc79545da646a6fd40b15fd72809c15831c.gz

diff --git a/classes/Profile_block.php b/classes/Profile_block.php
index 47f763386a06f4a36a91f926a30adff4604c8421..04b5f2faeba85f56d9b5949050d9846be556ff94 100644 (file)
--- a/classes/Profile_block.php
+++ b/classes/Profile_block.php
@@ -40,9 +40,4 @@ class Profile_block extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
-
-    function get($blocker, $blocked) {
-               return Profile_block::pkeyGet(array('blocker' => $blocker,
-                                            'blocked' => $blocked));
-    }
 }

diff --git a/classes/User.php b/classes/User.php
index 04558d43a1efaeeed8d84fbcca12c98e94ba2a6c..a64dc449d8fa5e5db22b342dd3a20efff997d1d1 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -145,7 +145,9 @@ class User extends Memcached_DataObject
        }
 
     function hasBlocked($other) {
-        $block = Profile_block::get($this->id, $other->id);
+
+        $block = Profile_block::pkeyGet(array('blocker' => $this->id,
+                                              'blocked' => $other->id));
 
         if (is_null($block)) {
             $result = false;
@@ -465,7 +467,8 @@ class User extends Memcached_DataObject
 
         # Get the block record
 
-        $block = Profile_block::get($this->id, $other->id);
+        $block = Profile_block::pkeyGet(array('blocker' => $this->id,
+                                              'blocked' => $other->id));
 
         if (!$block) {
             return false;