From 84457969088363e5c3ddd0c88e82a7638392f3c2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 8 Dec 2008 23:16:48 -0500
Subject: [PATCH] fix Profile_block::get() again

darcs-hash:20081209041648-5ed1f-fb6ed96047ebfbbe769a11cc3171ce8a5a1440a7.gz
---
 classes/Profile_block.php | 6 ++++++
 classes/User.php          | 6 ++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/classes/Profile_block.php b/classes/Profile_block.php
index 04b5f2faeb..6ea26a3bc4 100644
--- a/classes/Profile_block.php
+++ b/classes/Profile_block.php
@@ -40,4 +40,10 @@ 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 Memcached_DataObject::pkeyGet('Profile_block',
+                                             array('blocker' => $blocker,
+                                                   'blocked' => $blocked));
+     }
 }
diff --git a/classes/User.php b/classes/User.php
index a64dc449d8..ddb2e33103 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -146,8 +146,7 @@ class User extends Memcached_DataObject
 
     function hasBlocked($other) {
 
-        $block = Profile_block::pkeyGet(array('blocker' => $this->id,
-                                              'blocked' => $other->id));
+        $block = Profile_block::get($this->id, $other->id);
 
         if (is_null($block)) {
             $result = false;
@@ -467,8 +466,7 @@ class User extends Memcached_DataObject
 
         # Get the block record
 
-        $block = Profile_block::pkeyGet(array('blocker' => $this->id,
-                                              'blocked' => $other->id));
+        $block = Profile_block::get($this->id, $other->id);
 
         if (!$block) {
             return false;