diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-09-11 22:49:20 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-09-11 22:49:20 +0000 |
| commit | f6033d29e7000c9928c23ae77b2bb8b1b4850acb (patch) | |
| tree | b3dda696d460d403cbdb2747cce5b386aab509f7 /modules/user/user.module | |
| parent | 94e759a864291ee0e51dcd88b6de63ca541883ca (diff) | |
| download | brdo-f6033d29e7000c9928c23ae77b2bb8b1b4850acb.tar.gz brdo-f6033d29e7000c9928c23ae77b2bb8b1b4850acb.tar.bz2 | |
#10733: fixing broken user registration due to roles selection patch.
Diffstat (limited to 'modules/user/user.module')
| -rw-r--r-- | modules/user/user.module | 3 |
1 files changed, 2 insertions, 1 deletions
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><'. $edit['mail'] .'></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)); |