From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Thu, 12 Nov 2009 14:46:16 +0000 (+0000)
Subject: Some more XRDS fixes. With this and the previous commit, remote subs seem to work... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=707efadbd4b44435741ad9b2b972a77f4069e689;p=quix0rs-gnu-social.git

Some more XRDS fixes. With this and the previous commit, remote subs seem to work. Otherwise they don't.
---

diff --git a/actions/xrds.php b/actions/xrds.php
index 5db3489ade..76ccc9c6ec 100644
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -97,22 +97,18 @@ class XrdsAction extends Action
         $xrdsOutputter->element('Type', null, 'xri://$xrds*simple');
         $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_REQUEST,
                             common_local_url('requesttoken'),
-                            array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1));
-        $xrdsOutputter->showXrdsService( OAUTH_ENDPOINT_AUTHORIZE,
-                            common_local_url('userauthorization'),
                             array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1),
                             null,
-                            $this->user->getIdentifierURI());
+                            $this->user->uri);
+        $xrdsOutputter->showXrdsService( OAUTH_ENDPOINT_AUTHORIZE,
+                            common_local_url('userauthorization'),
+                            array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1));
         $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_ACCESS,
                             common_local_url('accesstoken'),
-                            array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1),
-                            null,
-                            $this->user->getIdentifierURI());
+                            array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1));
         $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_RESOURCE,
                             null,
-                            array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1),
-                            null,
-                            $this->user->getIdentifierURI());
+                            array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1));
         $xrdsOutputter->elementEnd('XRD');
         
         //omb