diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-21 16:45:42 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-21 16:45:42 -0400 |
| commit | 59beff6b46fb7693812558eaf728ca3709e4b066 (patch) | |
| tree | 3a178e7e1a68ce1390d4e6178000f744b38e68b6 /lib/action.php | |
| parent | bacef32aaca791ec5e25bd951094baec0b41df28 (diff) | |
Revert "Added configuration option to only allow OpenID logins."
This reverts commit 14b46e2183f10359cc53d597913a878f53e23719.
This functionality will need to be rewritten to work with the new
OpenIDPlugin.
Conflicts:
index.php
lib/logingroupnav.php
Diffstat (limited to 'lib/action.php')
| -rw-r--r-- | lib/action.php | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/action.php b/lib/action.php index 4d724fba5..ebd722719 100644 --- a/lib/action.php +++ b/lib/action.php @@ -439,17 +439,12 @@ class Action extends HTMLOutputter // lawsuit _('Logout'), _('Logout from the site'), false, 'nav_logout'); } else { - if (!common_config('site', 'openidonly')) { - if (!common_config('site', 'closed')) { - $this->menuItem(common_local_url('register'), - _('Register'), _('Create an account'), false, 'nav_register'); - } - $this->menuItem(common_local_url('login'), - _('Login'), _('Login to the site'), false, 'nav_login'); - } else { - $this->menuItem(common_local_url('openidlogin'), - _('OpenID'), _('Login with OpenID'), false, 'nav_openid'); + if (!common_config('site', 'closed')) { + $this->menuItem(common_local_url('register'), + _('Register'), _('Create an account'), false, 'nav_register'); } + $this->menuItem(common_local_url('login'), + _('Login'), _('Login to the site'), false, 'nav_login'); } $this->menuItem(common_local_url('doc', array('title' => 'help')), _('Help'), _('Help me!'), false, 'nav_help'); |