diff options
author | Craig Andrews <candrews@integralblue.com> | 2009-08-16 19:50:37 -0400 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2009-08-16 19:50:37 -0400 |
commit | 136a69a387719d560f97b6f8ee73d1224b2bac8c (patch) | |
tree | e9c0c02d89119a9d8c35b2d0c2485d8d888a65f4 /actions/login.php | |
parent | 46c77b83b1b10663ac80f6e1df604d529bb31dd4 (diff) | |
parent | 75a0a3e18b001454ab4844bc63d4052faf502138 (diff) |
Merge commit 'jeff-themovie/0.8.x-openid-enabled' into 0.8.x
Diffstat (limited to 'actions/login.php')
-rw-r--r-- | actions/login.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actions/login.php b/actions/login.php index c20854f15..6f1b4777e 100644 --- a/actions/login.php +++ b/actions/login.php @@ -251,11 +251,15 @@ class LoginAction extends Action return _('For security reasons, please re-enter your ' . 'user name and password ' . 'before changing your settings.'); - } else { + } else if (common_config('openid', 'enabled')) { return _('Login with your username and password. ' . 'Don\'t have a username yet? ' . '[Register](%%action.register%%) a new account, or ' . 'try [OpenID](%%action.openidlogin%%). '); + } else { + return _('Login with your username and password. ' . + 'Don\'t have a username yet? ' . + '[Register](%%action.register%%) a new account.'); } } |