summaryrefslogtreecommitdiff
path: root/classes/User.php
diff options
context:
space:
mode:
Diffstat (limited to 'classes/User.php')
-rw-r--r--classes/User.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/classes/User.php b/classes/User.php
index 04558d43a..a64dc449d 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;