From bacef32aaca791ec5e25bd951094baec0b41df28 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 21 Aug 2009 16:38:39 -0400 Subject: Revert "Added a configuration option to disable OpenID." This reverts commit 7dc3a90d1252137859a687e32313ea569dcf8796. Conflicts: actions/login.php actions/register.php lib/accountsettingsaction.php lib/common.php lib/logingroupnav.php --- actions/login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actions/login.php') diff --git a/actions/login.php b/actions/login.php index e09fdc76b..f5a658bf5 100644 --- a/actions/login.php +++ b/actions/login.php @@ -247,7 +247,7 @@ class LoginAction extends Action return _('For security reasons, please re-enter your ' . 'user name and password ' . 'before changing your settings.'); - } else if (common_config('openid', 'enabled')) { + } else { return _('Login with your username and password. ' . 'Don\'t have a username yet? ' . '[Register](%%action.register%%) a new account.'); -- cgit v1.2.3