diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-07-08 01:19:36 +0000 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-07-08 01:19:36 +0000 |
| commit | fd4aed21a7d178cf0b27e298a9dd8215f9e87cf1 (patch) | |
| tree | d5c155204f9eaf15b5d086308bfdec92e6a01b74 | |
| parent | 72d3ead0c274bd14d6e2851118049338108a6246 (diff) | |
| parent | 79b06ade27666a10cdfb54ba46af7a26b9a593d2 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
| -rw-r--r-- | lib/action.php | 2 | ||||
| -rw-r--r-- | plugins/FBConnect/FBConnectPlugin.php | 2 |
2 files changed, 0 insertions, 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'); } |