From b1142ed3ab1797e449d262e115d78cbb75deaa22 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 6 Jan 2009 22:43:43 -0500 Subject: [PATCH] Revert "XRDS namespace fix" This reverts commit 6d1d59a36bfa3659545027c7daf8b4abd0ac53a2. It seems to interfere with the Yadis discovery. --- actions/publicxrds.php | 2 +- actions/xrds.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/actions/publicxrds.php b/actions/publicxrds.php index 30f215af2d..951434c878 100644 --- a/actions/publicxrds.php +++ b/actions/publicxrds.php @@ -38,7 +38,7 @@ class PublicxrdsAction extends Action { common_start_xml(); common_element_start('XRDS', array('xmlns' => 'xri://$xrds')); - common_element_start('XRD', array('xmlns' => 'xri://$XRD*($v*2.0)', + common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'version' => '2.0')); diff --git a/actions/xrds.php b/actions/xrds.php index e82685a78c..1d516aab72 100644 --- a/actions/xrds.php +++ b/actions/xrds.php @@ -23,7 +23,7 @@ require_once(INSTALLDIR.'/lib/omb.php'); class XrdsAction extends Action { - function is_readonly() { + function is_readonly() { return true; } @@ -45,7 +45,7 @@ class XrdsAction extends Action { common_start_xml(); common_element_start('XRDS', array('xmlns' => 'xri://$xrds')); - common_element_start('XRD', array('xmlns' => 'xri://$XRD*($v*2.0)', + common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', 'xml:id' => 'oauth', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'version' => '2.0')); @@ -77,7 +77,7 @@ class XrdsAction extends Action { # XXX: decide whether to include user's ID/nickname in postNotice URL - common_element_start('XRD', array('xmlns' => 'xri://$XRD*($v*2.0)', + common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', 'xml:id' => 'omb', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'version' => '2.0')); @@ -92,7 +92,7 @@ class XrdsAction extends Action { common_element_end('XRD'); - common_element_start('XRD', array('xmlns' => 'xri://$XRD*($v*2.0)', + common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', 'version' => '2.0')); common_element('Type', NULL, 'xri://$xrds*simple');