summaryrefslogtreecommitdiff
path: root/plugins/OStatus/classes/Magicsig.php
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-02-26 15:10:45 -0800
committerZach Copley <zach@status.net>2010-02-26 15:10:45 -0800
commit59e34122b736eb070e9c39e361df3a2a028592c9 (patch)
tree7908590a14e40aa1e0e843d841e32b1dfe602eae /plugins/OStatus/classes/Magicsig.php
parentd3fc8e22193a86fc71ba21462db89c30fa2abc4b (diff)
parentee7603b09f162188caaf1d319a70e7fd5d6aa385 (diff)
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
Diffstat (limited to 'plugins/OStatus/classes/Magicsig.php')
-rw-r--r--plugins/OStatus/classes/Magicsig.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php
index d47dcf143..30da63c36 100644
--- a/plugins/OStatus/classes/Magicsig.php
+++ b/plugins/OStatus/classes/Magicsig.php
@@ -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;
}