diff options
author | Robin Millette <millette@controlyourself.ca> | 2009-04-14 23:03:31 +0000 |
---|---|---|
committer | Robin Millette <millette@controlyourself.ca> | 2009-04-14 23:03:31 +0000 |
commit | 533a463879e574f53fb84dd977e9d72a75023451 (patch) | |
tree | ac6caa220b15d50664beab5507e1a56b030839f2 /actions/publicxrds.php | |
parent | 20394664957a202cc86cc48ee2d115032e82c58a (diff) | |
parent | 9f2e2e4b2c1b428a1892c57c7194fbc5ede5b125 (diff) |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'actions/publicxrds.php')
-rw-r--r-- | actions/publicxrds.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/actions/publicxrds.php b/actions/publicxrds.php index aad59d779..2c52f1246 100644 --- a/actions/publicxrds.php +++ b/actions/publicxrds.php @@ -51,7 +51,7 @@ class PublicxrdsAction extends Action { /** * Is read only? - * + * * @return boolean true */ function isReadOnly() @@ -61,7 +61,7 @@ class PublicxrdsAction extends Action /** * Class handler. - * + * * @param array $args array of arguments * * @return nothing @@ -70,24 +70,24 @@ class PublicxrdsAction extends Action { parent::handle($args); header('Content-Type: application/xrds+xml'); - common_start_xml(); + $this->startXML(); $this->elementStart('XRDS', array('xmlns' => 'xri://$xrds')); $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'version' => '2.0')); $this->element('Type', null, 'xri://$xrds*simple'); - foreach (array('finishopenidlogin', 'finishaddopenid', 'finishimmediate') as $finish) { + foreach (array('finishopenidlogin', 'finishaddopenid') as $finish) { $this->showService(Auth_OpenID_RP_RETURN_TO_URL_TYPE, common_local_url($finish)); } $this->elementEnd('XRD'); $this->elementEnd('XRDS'); - common_end_xml(); + $this->endXML(); } /** * Show service. - * + * * @param string $type XRDS type * @param string $uri URI * @param array $params type parameters, null by default |