diff options
author | Craig Andrews <candrews@integralblue.com> | 2009-10-11 13:17:59 -0400 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2009-10-11 13:17:59 -0400 |
commit | 1f21e5ee79a2ce9da3d4d499565ba5412bd3b1f0 (patch) | |
tree | 03b1cb3bfea6ed1786687a44798af0fe9c4d6448 /plugins/FBConnect/FBCLoginGroupNav.php | |
parent | e9d7f18f0c2ad05c0203bc347a74c0f69e497566 (diff) | |
parent | c597aba342c2d4bd7ee53dc471d6b7deafb62a5e (diff) |
Merge commit 'refs/merge-requests/1738' of git://gitorious.org/statusnet/mainline 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')); |