Index: user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.998
diff -u -r1.998 user.module
--- modules/user/user.module	3 Jun 2009 07:28:28 -0000	1.998
+++ modules/user/user.module	3 Jun 2009 10:34:00 -0000
@@ -2765,6 +2765,7 @@
  */
 function user_register_submit($form, &$form_state) {
   global $base_url;
+  global $language;
   $admin = user_access('administer users');
 
   $mail = $form_state['values']['mail'];
@@ -2795,6 +2796,11 @@
   unset($form_state['values']['form_token'], $form_state['values']['submit'], $form_state['values']['op'], $form_state['values']['notify'], $form_state['values']['form_id'], $form_state['values']['affiliates'], $form_state['values']['destination'], $form_state['values']['form_build_id']);
 
   $merge_data = array('pass' => $pass, 'init' => $mail, 'roles' => $roles);
+
+  if (empty($form_state['values']['language'])) {
+    $merge_data['language'] = $language->language;
+  }
+
   if (!$admin) {
     // Set the user's status because it was not displayed in the form.
     $merge_data['status'] = variable_get('user_register', 1) == 1;
Index: user.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.test,v
retrieving revision 1.38
diff -u -r1.38 user.test
--- modules/user/user.test	24 May 2009 17:39:35 -0000	1.38
+++ modules/user/user.test	3 Jun 2009 10:32:12 -0000
@@ -44,7 +44,9 @@
     $this->assertTrue(($user->created > REQUEST_TIME - 20 ), t('Correct creation time.'));
     $this->assertEqual($user->status, variable_get('user_register', 1) == 1 ? 1 : 0, t('Correct status field.'));
     $this->assertEqual($user->timezone, variable_get('date_default_timezone'), t('Correct time zone field.'));
-    $this->assertEqual($user->language, '', t('Correct language field.'));
+    //Get global language and test that the user has it set. Drupal drupalWebTestCase always uses "en".
+    global $language;
+    $this->assertEqual($user->language, $language->language, t('Correct language field.'));
     $this->assertEqual($user->picture, '', t('Correct picture field.'));
     $this->assertEqual($user->init, $mail, t('Correct init field.'));