summaryrefslogtreecommitdiff
path: root/plugins/OpenID/openidlogin.php
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 /plugins/OpenID/openidlogin.php
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 'plugins/OpenID/openidlogin.php')
-rw-r--r--plugins/OpenID/openidlogin.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php
index 76f573b9f..3d968c56e 100644
--- a/plugins/OpenID/openidlogin.php
+++ b/plugins/OpenID/openidlogin.php
@@ -26,9 +26,7 @@ class OpenidloginAction extends Action
function handle($args)
{
parent::handle($args);
- if (!common_config('openid', 'enabled')) {
- common_redirect(common_local_url('login'));
- } else if (common_is_real_login()) {
+ if (common_is_real_login()) {
$this->clientError(_('Already logged in.'));
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$openid_url = $this->trimmed('openid_url');