diff options
| author | Craig Andrews <candrews@integralblue.com> | 2009-08-10 11:53:35 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2009-08-10 11:53:35 -0400 |
| commit | e9ed20a69d8f646bc85151c1e890f5828a966fcf (patch) | |
| tree | e72bdf25cc94c630c31863d2985b1f29b4b27414 /lib/action.php | |
| parent | 17dcf1c3170bc905e3b0fdffc804d6f7229ac61b (diff) | |
| parent | 14b46e2183f10359cc53d597913a878f53e23719 (diff) | |
Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x
Diffstat (limited to 'lib/action.php')
| -rw-r--r-- | lib/action.php | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/action.php b/lib/action.php index 326edf3a0..6da9adab5 100644 --- a/lib/action.php +++ b/lib/action.php @@ -436,12 +436,17 @@ class Action extends HTMLOutputter // lawsuit _('Logout'), _('Logout from the site'), false, 'nav_logout'); } else { - if (!common_config('site', 'closed')) { - $this->menuItem(common_local_url('register'), - _('Register'), _('Create an account'), false, 'nav_register'); + 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'); } - $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'); |