From bacef32aaca791ec5e25bd951094baec0b41df28 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
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
---
 plugins/OpenID/finishopenidlogin.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'plugins/OpenID/finishopenidlogin.php')

diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php
index 87fc3881e..bc0d2d66c 100644
--- a/plugins/OpenID/finishopenidlogin.php
+++ b/plugins/OpenID/finishopenidlogin.php
@@ -30,9 +30,7 @@ class FinishopenidloginAction 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') {
             $token = $this->trimmed('token');
-- 
cgit v1.2.3-54-g00ecf