diff options
| author | Zach Copley <zach@status.net> | 2010-02-26 22:54:03 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-02-26 22:54:03 +0000 |
| commit | cd831dbc4cbdcb6afbcdc59cfee8d0df2558061c (patch) | |
| tree | b1cce33fff4eb38b24f8553fee7a82b6acee0bb5 | |
| parent | dccc9954462a014f4d241091777c3834887d933b (diff) | |
| parent | ee7603b09f162188caaf1d319a70e7fd5d6aa385 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
| -rw-r--r-- | plugins/OStatus/classes/Magicsig.php | 6 |
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; } |