summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Walker <walkah@walkah.net>2010-02-26 17:52:12 -0500
committerJames Walker <walkah@walkah.net>2010-02-26 17:53:27 -0500
commitee7603b09f162188caaf1d319a70e7fd5d6aa385 (patch)
treeb1cce33fff4eb38b24f8553fee7a82b6acee0bb5
parenta5cfda850537e5e55d61f381cfac7d5100aa3bea (diff)
better return check in Magicsig::staticGet()
-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;
}