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

Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

Browse Source 
* 'testing' of gitorious.org:statusnet/mainline:
  better return check in Magicsig::staticGet()
  blow cache on known replies
This commit is contained in:
Zach Copley 2010-02-26 15:10:45 -08:00
commit 59e34122b7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Notice.php
View File

@ -944,6 +944,8 @@ class Notice extends Memcached_DataObject
$reply->profile_id = $user->id;
$id = $reply->insert();
self::blow('reply:stream:%d', $user->id);
}
}

6
plugins/OStatus/classes/Magicsig.php
View File

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