Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline: better return check in Magicsig::staticGet() blow cache on known replies
This commit is contained in:
commit
59e34122b7
|
@ -944,6 +944,8 @@ class Notice extends Memcached_DataObject
|
|||
$reply->profile_id = $user->id;
|
||||
|
||||
$id = $reply->insert();
|
||||
|
||||
self::blow('reply:stream:%d', $user->id);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -50,7 +50,11 @@ class Magicsig extends Memcached_DataObject
|
|||
public /*static*/ function staticGet($k, $v=null)
|
||||
{
|
||||
$obj = parent::staticGet(__CLASS__, $k, $v);
|
||||
return Magicsig::fromString($obj->keypair);
|
||||
if (!empty($obj)) {
|
||||
return Magicsig::fromString($obj->keypair);
|
||||
}
|
||||
|
||||
return $obj;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user