eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed Profile_block::get, changed to use pkeyGet 

darcs-hash:20081209041227-5ed1f-2edefdc79545da646a6fd40b15fd72809c15831c.gz
This commit is contained in:
Evan Prodromou 2008-12-08 23:12:27 -05:00
parent a68f513cc8
commit facba2566b
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/Profile_block.php
View File

@ -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));
}
}

7
classes/User.php
View File

@ -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;