? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1038
diff -U5 -r1.1038 user.module
--- modules/user/user.module	1 Sep 2009 17:40:28 -0000	1.1038
+++ modules/user/user.module	3 Sep 2009 03:34:37 -0000
@@ -2976,11 +2976,11 @@
     if (variable_get('user_email_verification', TRUE)) {
       drupal_set_message(t('</p><p> Your password is <strong>%pass</strong>. You may change your password below.</p>', array('%pass' => $pass)));
     }
 
     $form_state['values'] += $merge_data;
-    user_authenticate(array_merge($form_state));
+    user_authenticate($form_state['values']['name'], $pass);
 
     $form_state['redirect'] = 'user/1/edit';
     return;
   }
   else {
@@ -2991,11 +2991,12 @@
     }
     elseif (!variable_get('user_email_verification', TRUE) && $account->status && !$admin) {
       // No e-mail verification is required, create new user account, and login
       // user immediately.
       _user_mail_notify('register_no_approval_required', $account);
-      if (user_authenticate(array_merge($form_state['values'], $merge_data))) {
+      $form_state['values'] += $merge_data;
+      if (user_authenticate($form_state['values']['name'], $pass)) {
         drupal_set_message(t('Registration successful. You are now logged in.'));
       }
       $form_state['redirect'] = '';
       return;
     }