summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiaran Gultnieks <ciaran@ciarang.com>2009-11-12 14:46:16 +0000
committerCiaran Gultnieks <ciaran@ciarang.com>2009-11-12 14:46:16 +0000
commit707efadbd4b44435741ad9b2b972a77f4069e689 (patch)
tree2ec91508d4204e9d5741fb0c484b9d90a1c4d794
parent6e601c11718d075cf17c463e997023058f18aa99 (diff)
Some more XRDS fixes. With this and the previous commit, remote subs seem to work. Otherwise they don't.
-rw-r--r--actions/xrds.php16
1 files changed, 6 insertions, 10 deletions
diff --git a/actions/xrds.php b/actions/xrds.php
index 5db3489ad..76ccc9c6e 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