diff options
| author | Brion Vibber <brion@pobox.com> | 2009-10-13 16:45:26 +0000 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2009-10-13 16:45:26 +0000 |
| commit | 834ac7aa1172518c112bbf90561ead34499e20b8 (patch) | |
| tree | 474dc49eed8ff3542e6d2c8154e14fa4b8432ada /plugins/FBConnect/FBCLoginGroupNav.php | |
| parent | 18df82ba2302d5b72bc42f4d3296d6fff7d16341 (diff) | |
| parent | 006cfc528edab32548d1265df5dada09a1536aed (diff) | |
Merge branch '0.8.x' of git@gitorious.org:~brion/statusnet/brion-fixes into 0.8.x
Diffstat (limited to 'plugins/FBConnect/FBCLoginGroupNav.php')
| -rw-r--r-- | plugins/FBConnect/FBCLoginGroupNav.php | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/plugins/FBConnect/FBCLoginGroupNav.php b/plugins/FBConnect/FBCLoginGroupNav.php index 6e12c2040..81b2520a4 100644 --- a/plugins/FBConnect/FBCLoginGroupNav.php +++ b/plugins/FBConnect/FBCLoginGroupNav.php @@ -78,16 +78,20 @@ class FBCLoginGroupNav extends Widget // action => array('prompt', 'title') $menu = array(); - $menu['login'] = array(_('Login'), - _('Login with a username and password')); - - if (!(common_config('site','closed') || common_config('site','inviteonly'))) { - $menu['register'] = array(_('Register'), - _('Sign up for a new account')); + if (!common_config('site','openidonly')) { + $menu['login'] = array(_('Login'), + _('Login with a username and password')); + + if (!(common_config('site','closed') || common_config('site','inviteonly'))) { + $menu['register'] = array(_('Register'), + _('Sign up for a new account')); + } } - $menu['openidlogin'] = array(_('OpenID'), - _('Login or register with OpenID')); + if (common_config('openid', 'enabled')) { + $menu['openidlogin'] = array(_('OpenID'), + _('Login or register with OpenID')); + } $menu['FBConnectLogin'] = array(_('Facebook'), _('Login or register using Facebook')); |