minor corrections for OMB discovery

darcs-hash:20080602185137-84dde-0a3db0833eaf9361447559a6366e3820ae1f0694.gz

diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index b0e49903b6767fe3f2a8c95b4ab4546645ac8581..c61109d6a254acb3c2724c076ab9a7b8a4aad794 100644 (file)
--- 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 7448b50f7d145b8972391793d02057230e02d1f0..ef62f3b6e9addea3994e65a306ad0b1c75ddfc1b 100644 (file)
--- 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'),