From 9a67fb99ef23facf62151974a9c553ca68888281 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 27 May 2010 12:29:39 +0000
Subject: - Patch #174972 by rfay, stBorchert, gaele: user creation setting
 should be 'Visitors, with admin approval'.

---
 modules/openid/openid.module | 2 +-
 modules/openid/openid.test   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules/openid')

diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index b678e92ae..a6f2cd6d0 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -589,7 +589,7 @@ function openid_authentication($response) {
       drupal_set_message(t('You must validate your email address for this account before logging in via OpenID.'));
     }
   }
-  elseif (variable_get('user_register', 1)) {
+  elseif (variable_get('user_register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL)) {
     // Register new user.
 
     // Save response for use in openid_form_user_register_form_alter().
diff --git a/modules/openid/openid.test b/modules/openid/openid.test
index e0670710a..8d4ac5031 100644
--- a/modules/openid/openid.test
+++ b/modules/openid/openid.test
@@ -240,6 +240,7 @@ class OpenIDRegistrationTestCase extends OpenIDWebTestCase {
 
   function setUp() {
     parent::setUp('openid', 'openid_test');
+    variable_set('user_register', USER_REGISTER_VISITORS);
   }
 
   /**
-- 
cgit v1.2.3