From facba2566b7695a84cb8bd6b40e9f9b842db6776 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 8 Dec 2008 23:12:27 -0500
Subject: [PATCH] removed Profile_block::get, changed to use pkeyGet

darcs-hash:20081209041227-5ed1f-2edefdc79545da646a6fd40b15fd72809c15831c.gz
---
 classes/Profile_block.php | 5 -----
 classes/User.php          | 7 +++++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/classes/Profile_block.php b/classes/Profile_block.php
index 47f763386a..04b5f2faeb 100644
--- 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 04558d43a1..a64dc449d8 100644
--- 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;