GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

fix Profile_block::get() again 

darcs-hash:20081209041648-5ed1f-fb6ed96047ebfbbe769a11cc3171ce8a5a1440a7.gz
This commit is contained in:
Evan Prodromou 2008-12-08 23:16:48 -05:00
parent facba2566b
commit 8445796908
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/Profile_block.php
View File

@ -40,4 +40,10 @@ 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 Memcached_DataObject::pkeyGet('Profile_block',
array('blocker' => $blocker,
'blocked' => $blocked));
}
}

6
classes/User.php
View File

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