diff options
| author | James Walker <walkah@walkah.net> | 2010-03-11 14:32:22 -0500 |
|---|---|---|
| committer | James Walker <walkah@walkah.net> | 2010-03-11 14:49:12 -0500 |
| commit | 512e51105372daf9c85af9284de1463084f03aa9 (patch) | |
| tree | b5501b8be9781275e50b496599fa3fd89bea60c6 | |
| parent | 06612e35e433109e00167ac62d65299210ef0032 (diff) | |
fix invalid separator in magic-public-key XRD and matching parsing.
| -rw-r--r-- | plugins/OStatus/lib/magicenvelope.php | 6 | ||||
| -rw-r--r-- | plugins/OStatus/lib/xrdaction.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php index c927209e4..9266cab5c 100644 --- a/plugins/OStatus/lib/magicenvelope.php +++ b/plugins/OStatus/lib/magicenvelope.php @@ -59,7 +59,11 @@ class MagicEnvelope } if ($xrd->links) { if ($link = Discovery::getService($xrd->links, Magicsig::PUBLICKEYREL)) { - list($type, $keypair) = explode(';', $link['href']); + list($type, $keypair) = explode(',', $link['href']); + if (empty($keypair)) { + // Backwards compatibility check for separator bug in 0.9.0 + list($type, $keypair) = explode(';', $link['href']); + } return $keypair; } } diff --git a/plugins/OStatus/lib/xrdaction.php b/plugins/OStatus/lib/xrdaction.php index 6881292ad..b3c1d8453 100644 --- a/plugins/OStatus/lib/xrdaction.php +++ b/plugins/OStatus/lib/xrdaction.php @@ -91,7 +91,7 @@ class XrdAction extends Action } $xrd->links[] = array('rel' => Magicsig::PUBLICKEYREL, - 'href' => 'data:application/magic-public-key;'. $magickey->toString(false)); + 'href' => 'data:application/magic-public-key,'. $magickey->toString(false)); // TODO - finalize where the redirect should go on the publisher $url = common_local_url('ostatussub') . '?profile={uri}'; |