summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/Profile_block.php5
-rw-r--r--classes/User.php7
2 files changed, 5 insertions, 7 deletions
diff --git a/classes/Profile_block.php b/classes/Profile_block.php
index 47f763386..04b5f2fae 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 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;