From 4b656f47dff2bd6eed4dcfad060b8434d052d883 Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Wed, 9 Jul 2008 18:46:30 -0400 Subject: Merge conflicts and kill a whole lot of trailing whitespace on lines. darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz --- actions/publicxrds.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'actions/publicxrds.php') diff --git a/actions/publicxrds.php b/actions/publicxrds.php index c41c3b2a8..29c8e1314 100644 --- a/actions/publicxrds.php +++ b/actions/publicxrds.php @@ -26,14 +26,14 @@ require_once(INSTALLDIR.'/lib/openid.php'); class PublicxrdsAction extends Action { function handle($args) { - + parent::handle($args); - + header('Content-Type: application/xrds+xml'); common_start_xml(); common_element_start('XRDS', array('xmlns' => 'xri://$xrds')); - + common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'version' => '2.0')); @@ -44,13 +44,13 @@ class PublicxrdsAction extends Action { $this->show_service(Auth_OpenID_RP_RETURN_TO_URL_TYPE, common_local_url($finish)); } - + common_element_end('XRD'); - + common_element_end('XRDS'); common_end_xml(); } - + function show_service($type, $uri, $params=NULL, $sigs=NULL, $localId=NULL) { common_element_start('Service'); if ($uri) { -- cgit v1.2.3-54-g00ecf