summaryrefslogtreecommitdiff
path: root/classes/User.php
diff options
context:
space:
mode:
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;