forked from GNUsocial/gnu-social
Revert "XRDS namespace fix"
This reverts commit 6d1d59a36bfa3659545027c7daf8b4abd0ac53a2. It seems to interfere with the Yadis discovery.
This commit is contained in:
parent
6d1d59a36b
commit
b1142ed3ab
@ -38,7 +38,7 @@ class PublicxrdsAction extends Action {
|
|||||||
common_start_xml();
|
common_start_xml();
|
||||||
common_element_start('XRDS', array('xmlns' => 'xri://$xrds'));
|
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',
|
'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
|
||||||
'version' => '2.0'));
|
'version' => '2.0'));
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ class XrdsAction extends Action {
|
|||||||
common_start_xml();
|
common_start_xml();
|
||||||
common_element_start('XRDS', array('xmlns' => 'xri://$xrds'));
|
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',
|
'xml:id' => 'oauth',
|
||||||
'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
|
'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
|
||||||
'version' => '2.0'));
|
'version' => '2.0'));
|
||||||
@ -77,7 +77,7 @@ class XrdsAction extends Action {
|
|||||||
|
|
||||||
# XXX: decide whether to include user's ID/nickname in postNotice URL
|
# 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',
|
'xml:id' => 'omb',
|
||||||
'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
|
'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
|
||||||
'version' => '2.0'));
|
'version' => '2.0'));
|
||||||
@ -92,7 +92,7 @@ class XrdsAction extends Action {
|
|||||||
|
|
||||||
common_element_end('XRD');
|
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'));
|
'version' => '2.0'));
|
||||||
|
|
||||||
common_element('Type', NULL, 'xri://$xrds*simple');
|
common_element('Type', NULL, 'xri://$xrds*simple');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user