From f6033d29e7000c9928c23ae77b2bb8b1b4850acb Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Sat, 11 Sep 2004 22:49:20 +0000
Subject: #10733: fixing broken user registration due to roles selection patch.

---
 modules/user.module      | 3 ++-
 modules/user/user.module | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/user.module b/modules/user.module
index 400393e32..af39a0a38 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -928,6 +928,7 @@ function user_register($edit = array()) {
   }
 
   if ($edit) {
+    $edit['roles'] = array(_user_authenticated_id()); // needed for validation
     user_module_invoke('validate', $edit, $edit, 'account');
 
     if (!form_get_errors()) {
@@ -936,7 +937,7 @@ function user_register($edit = array()) {
 
       // TODO: Is this necessary? Won't session_write() replicate this?
       unset($edit['session']);
-      $account = user_save('', array('name' => $edit['name'], 'pass' => $pass, 'init' => $edit['mail'], 'mail' => $edit['mail'], 'roles' => array(_user_authenticated_id()), 'status' => (variable_get('user_register', 1) == 1 ? 1 : 0)));
+      $account = user_save('', array('name' => $edit['name'], 'pass' => $pass, 'init' => $edit['mail'], 'mail' => $edit['mail'], 'roles' => $edit['roles'], 'status' => (variable_get('user_register', 1) == 1 ? 1 : 0)));
       watchdog('user', t('New user: %name %e-mail.', array('%name' => '<em>'. $edit['name'] .'</em>', '%e-mail' => '<em>&lt;'. $edit['mail'] .'&gt;</em>')), l(t('edit'), 'user/'. $account->uid .'/edit'));
 
       $variables = array('%username' => $edit['name'], '%site' => variable_get('site_name', 'drupal'), '%password' => $pass, '%uri' => $base_url, '%uri_brief' => substr($base_url, strlen('http://')), '%mailto' => $edit['mail'], '%date' => format_date(time()), '%login_uri' => url('user/login', NULL, NULL, TRUE), '%edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE));
diff --git a/modules/user/user.module b/modules/user/user.module
index 400393e32..af39a0a38 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -928,6 +928,7 @@ function user_register($edit = array()) {
   }
 
   if ($edit) {
+    $edit['roles'] = array(_user_authenticated_id()); // needed for validation
     user_module_invoke('validate', $edit, $edit, 'account');
 
     if (!form_get_errors()) {
@@ -936,7 +937,7 @@ function user_register($edit = array()) {
 
       // TODO: Is this necessary? Won't session_write() replicate this?
       unset($edit['session']);
-      $account = user_save('', array('name' => $edit['name'], 'pass' => $pass, 'init' => $edit['mail'], 'mail' => $edit['mail'], 'roles' => array(_user_authenticated_id()), 'status' => (variable_get('user_register', 1) == 1 ? 1 : 0)));
+      $account = user_save('', array('name' => $edit['name'], 'pass' => $pass, 'init' => $edit['mail'], 'mail' => $edit['mail'], 'roles' => $edit['roles'], 'status' => (variable_get('user_register', 1) == 1 ? 1 : 0)));
       watchdog('user', t('New user: %name %e-mail.', array('%name' => '<em>'. $edit['name'] .'</em>', '%e-mail' => '<em>&lt;'. $edit['mail'] .'&gt;</em>')), l(t('edit'), 'user/'. $account->uid .'/edit'));
 
       $variables = array('%username' => $edit['name'], '%site' => variable_get('site_name', 'drupal'), '%password' => $pass, '%uri' => $base_url, '%uri_brief' => substr($base_url, strlen('http://')), '%mailto' => $edit['mail'], '%date' => format_date(time()), '%login_uri' => url('user/login', NULL, NULL, TRUE), '%edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE));
-- 
cgit v1.2.3