summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-21 16:38:39 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-21 16:38:39 -0400
commitbacef32aaca791ec5e25bd951094baec0b41df28 (patch)
treee0554108a02208e4d26aeed91fd2fe8a870b164f /actions
parent9f356b55c6f419468771c0f3c2450010c0242abe (diff)
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
Diffstat (limited to 'actions')
-rw-r--r--actions/login.php2
1 files changed, 1 insertions, 1 deletions
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.');