Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
This commit is contained in:
commit
cd831dbc4c
@ -50,9 +50,13 @@ class Magicsig extends Memcached_DataObject
|
|||||||
public /*static*/ function staticGet($k, $v=null)
|
public /*static*/ function staticGet($k, $v=null)
|
||||||
{
|
{
|
||||||
$obj = parent::staticGet(__CLASS__, $k, $v);
|
$obj = parent::staticGet(__CLASS__, $k, $v);
|
||||||
|
if (!empty($obj)) {
|
||||||
return Magicsig::fromString($obj->keypair);
|
return Magicsig::fromString($obj->keypair);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return $obj;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
function table()
|
function table()
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user