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 /plugins/OStatus/lib/magicenvelope.php | |
parent | 06612e35e433109e00167ac62d65299210ef0032 (diff) |
fix invalid separator in magic-public-key XRD and matching parsing.
Diffstat (limited to 'plugins/OStatus/lib/magicenvelope.php')
-rw-r--r-- | plugins/OStatus/lib/magicenvelope.php | 6 |
1 files changed, 5 insertions, 1 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; } } |