diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-26 12:33:50 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-26 12:33:50 -0800 |
| commit | 9b366547d743b9c85455e02cae2f84a658a4baf2 (patch) | |
| tree | 815817fdd6a88f9cac18de9f8be0544bb8df3a80 /plugins/OStatus/classes/Magicsig.php | |
| parent | 517fd54b6515375b075a5d7253a8b66e53785baa (diff) | |
| parent | 88ae7f53bb4470a899678d231cecb8cb963b2075 (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OStatus/classes/Magicsig.php')
| -rw-r--r-- | plugins/OStatus/classes/Magicsig.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php index 02882d19b..751527c81 100644 --- a/plugins/OStatus/classes/Magicsig.php +++ b/plugins/OStatus/classes/Magicsig.php @@ -49,7 +49,8 @@ class Magicsig extends Memcached_DataObject public /*static*/ function staticGet($k, $v=null) { - return parent::staticGet(__CLASS__, $k, $v); + $obj = parent::staticGet(__CLASS__, $k, $v); + return Magicsig::fromString($obj->keypair); } |