summaryrefslogtreecommitdiff
path: root/classes/User.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2008-12-08 23:16:48 -0500
committerEvan Prodromou <evan@controlyourself.ca>2008-12-08 23:16:48 -0500
commit84457969088363e5c3ddd0c88e82a7638392f3c2 (patch)
tree59208abaf8823c804bbb3a97b4f5afc86a5a0ffb /classes/User.php
parentfacba2566b7695a84cb8bd6b40e9f9b842db6776 (diff)
fix Profile_block::get() again
darcs-hash:20081209041648-5ed1f-fb6ed96047ebfbbe769a11cc3171ce8a5a1440a7.gz
Diffstat (limited to 'classes/User.php')
-rw-r--r--classes/User.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/classes/User.php b/classes/User.php
index a64dc449d..ddb2e3310 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;