From 802b9095188d51fd64d459291ca8828530220e83 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 7 Jul 2009 14:21:44 -0700
Subject: user/show API method needs to fall back to basic auth so that
 verify_credentials works correctly.

---
 actions/twitapiusers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index e9fcccbde..de8326e3a 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -43,7 +43,7 @@ class TwitapiusersAction extends TwitterapiAction
         if ($email) {
             $user = User::staticGet('email', $email);
         } else {
-            $user = $this->get_user($apidata['api_arg']);
+            $user = $this->get_user($apidata['api_arg'], $apidata);
         }
 
         if (empty($user)) {
-- 
cgit v1.2.3-54-g00ecf


From 79b06ade27666a10cdfb54ba46af7a26b9a593d2 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Wed, 8 Jul 2009 00:42:14 +0000
Subject: Removed OpenID link from the primary global navigation in order to
 keep a single Login idea because we have several ways to login already:
 regular login, OpenID and Facebook (and probably LDAP, Open Social in the
 future)

---
 lib/action.php                        | 2 --
 plugins/FBConnect/FBConnectPlugin.php | 2 --
 2 files changed, 4 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 928eb48c0..da5b48858 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -439,8 +439,6 @@ class Action extends HTMLOutputter // lawsuit
                     $this->menuItem(common_local_url('register'),
                                     _('Register'), _('Create an account'), false, 'nav_register');
                 }
-                $this->menuItem(common_local_url('openidlogin'),
-                                _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
                 $this->menuItem(common_local_url('login'),
                                 _('Login'), _('Login to the site'), false, 'nav_login');
             }
diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php
index d8af1a4e8..65870a187 100644
--- a/plugins/FBConnect/FBConnectPlugin.php
+++ b/plugins/FBConnect/FBConnectPlugin.php
@@ -313,8 +313,6 @@ class FBConnectPlugin extends Plugin
                  $action->menuItem(common_local_url('register'),
                      _('Register'), _('Create an account'), false, 'nav_register');
              }
-             $action->menuItem(common_local_url('openidlogin'),
-                 _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
              $action->menuItem(common_local_url('login'),
                  _('Login'), _('Login to the site'), false, 'nav_login');
          }
-- 
cgit v1.2.3-54-g00ecf