diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-07-07 21:16:19 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-07-07 21:16:19 -0400 |
| commit | f6c8efdce641809d71067967225204ae9116af96 (patch) | |
| tree | 878964d20276ea30cd94c2248be327adc0bcd1e1 | |
| parent | b25e6139e8d6b3dcb9ca76ac8c43729dc17eedb4 (diff) | |
| parent | 79b06ade27666a10cdfb54ba46af7a26b9a593d2 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
| -rw-r--r-- | actions/twitapiusers.php | 2 | ||||
| -rw-r--r-- | lib/action.php | 2 | ||||
| -rw-r--r-- | plugins/FBConnect/FBConnectPlugin.php | 2 |
3 files changed, 1 insertions, 5 deletions
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)) { 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'); } |