summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-06-02 14:51:37 -0400
committerEvan Prodromou <evan@prodromou.name>2008-06-02 14:51:37 -0400
commit0f374fb944438644b4e1059fc84995615e92e870 (patch)
tree5c314127da95e93484f0550a3459488e154f8212 /actions
parent823b79366fe25059f7526e13da0175e8ecbeedb4 (diff)
minor corrections for OMB discovery
darcs-hash:20080602185137-84dde-0a3db0833eaf9361447559a6366e3820ae1f0694.gz
Diffstat (limited to 'actions')
-rw-r--r--actions/remotesubscribe.php2
-rw-r--r--actions/xrds.php3
2 files changed, 2 insertions, 3 deletions
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index b0e49903b..c61109d6a 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -186,7 +186,7 @@ class RemotesubscribeAction extends Action {
# XXX: check that we got all the services we needed
foreach (array_merge($omb_endpoints, $oauth_endpoints) as $type) {
- if (!array_key_exists($type, $omb)) {
+ if (!array_key_exists($type, $omb) || !$omb[$type]) {
common_debug('remotesubscribe.php - could not find type "'.$type.'"');
return NULL;
}
diff --git a/actions/xrds.php b/actions/xrds.php
index 7448b50f7..ef62f3b6e 100644
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -57,8 +57,7 @@ class XrdsAction extends Action {
$this->show_service(OAUTH_ENDPOINT_AUTHORIZE,
common_local_url('userauthorization'),
array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
- array(OAUTH_HMAC_SHA1),
- $user->uri);
+ array(OAUTH_HMAC_SHA1));
$this->show_service(OAUTH_ENDPOINT_ACCESS,
common_local_url('accesstoken'),