4 files changed, 14 insertions, 21 deletions
diff --git a/modules/contact/contact.test b/modules/contact/contact.test
index ae5fbe1ec..ecac2db1a 100644
--- a/modules/contact/contact.test
+++ b/modules/contact/contact.test
@@ -80,7 +80,7 @@ class ContactSitewideTestCase extends DrupalWebTestCase {
     $this->setPermission('anonymous user', array('access site-wide contact form' => TRUE));
     $this->drupalLogout();
     $this->drupalGet('contact');
-    $this->assertText(t('Contact'), t('Contact form is shown when there is one category.'));
+    $this->assertText(t('Your e-mail address'), t('Contact form is shown when there is one category.'));
     $this->assertNoText(t('Category'), t('When there is only one category, the category selection element is hidden.'));
     $this->drupalLogin($admin_user);
 
diff --git a/modules/system/system.install b/modules/system/system.install
index 84f0eaa76..48dfd9b0e 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -3266,7 +3266,7 @@ function system_update_7021() {
   foreach ($result as $theme) {
     $themes_with_blocks[] = $theme->name;
     // Add new system generated help block.
-    $ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('system', 'help', '". $theme->name ."', 1, 0, 'help', '', 1)");
+    $ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('system', 'help', '" . $theme->name . "', 1, 0, 'help', '', 1)");
   }
 
   // Migrate contact form information and user register help to blocks.
@@ -3275,17 +3275,17 @@ function system_update_7021() {
     db_insert('box')->fields(array('body' => $contact_help, 'info' => 'Contact page help', 'format' => FILTER_FORMAT_DEFAULT))->execute();
     foreach ($themes_with_blocks as $theme) {
       // Add contact help block for themes, which had blocks.
-      $ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, visibility, pages, cache) VALUES ('block', '". ($bid_max + 1) ."', '". $theme ."', 1, 5, 'help', 1, 'contact', -1)");
+      $ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, visibility, pages, cache) VALUES ('block', '" . ($bid_max + 1) . "', '" . $theme . "', 1, 5, 'help', 1, 'contact', -1)");
     }
-    drupal_set_message('The contact form information setting was migrated to <a href="'. url('admin/build/block/configure/block/' . ($bid_max + 1)) . '">a custom block</a> and set up to only show on the site-wide contact page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.');
+    drupal_set_message('The contact form information setting was migrated to <a href="' . url('admin/build/block/configure/block/' . ($bid_max + 1)) . '">a custom block</a> and set up to only show on the site-wide contact page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.');
   }
   if ($user_help = variable_get('user_registration_help', '')) {
     db_insert('box')->fields(array('body' => $user_help, 'info' => 'User registration guidelines', 'format' => FILTER_FORMAT_DEFAULT))->execute();
     foreach ($themes_with_blocks as $theme) {
       // Add user registration help block for themes, which had blocks.
-      $ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, visibility, pages, cache) VALUES ('block', '". ($bid_max + 2) ."', '". $theme ."', 1, 5, 'help', 1, 'user/register', -1)");
+      $ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, visibility, pages, cache) VALUES ('block', '" . ($bid_max + 2) . "', '" . $theme . "', 1, 5, 'help', 1, 'user/register', -1)");
     }
-    drupal_set_message('The user registration guidelines were migrated to <a href="'. url('admin/build/block/configure/block/' . ($bid_max + 2)) . '">a custom block</a> and set up to only show on the user registration page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.');
+    drupal_set_message('The user registration guidelines were migrated to <a href="' . url('admin/build/block/configure/block/' . ($bid_max + 2)) . '">a custom block</a> and set up to only show on the user registration page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.');
   }
   // Remove the two variables (even if they were saved empty on the admin interface),
   // to avoid keeping clutter in the variables table.
@@ -3293,7 +3293,7 @@ function system_update_7021() {
   variable_del('user_registration_help');
   
   // Rebuild theme data, so the new 'help' region is identified.
-  system_theme_data();
+  _system_theme_data();
 
   return $ret;
 }
diff --git a/modules/system/system.module b/modules/system/system.module
index bf10db57a..98d1b2f00 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -892,12 +892,11 @@ function system_block_list() {
   $blocks['powered-by'] = array(
     'info' => t('Powered by Drupal'),
     'weight' => '10',
-     // Not worth caching.
     'cache' => BLOCK_NO_CACHE,
   );
   $blocks['help'] = array(
-   'info' => t('System help'),
-   'weight' => '5',
+    'info' => t('System help'),
+    'weight' => '5',
   );
   // System-defined menu blocks.
   foreach (menu_list_system_menus() as $menu_name => $title) {
@@ -960,17 +959,13 @@ function system_block_view($delta = '') {
   switch ($delta) {
     case 'powered-by':
       $image_path = 'misc/' . variable_get('drupal_badge_color', 'powered-blue') . '-' . variable_get('drupal_badge_size', '80x15') . '.png';
-      // Don't display a title.
       $block['subject'] = NULL;
       $block['content'] = theme('system_powered_by', $image_path);
       return $block;
     case 'help':
-      return array(
-        // Don't display a title.
-        'subject' => NULL, 
-        'content' => menu_get_active_help(),
-      );
-      break;
+      $block['subject'] = NULL;
+      $block['content'] = menu_get_active_help();
+      return $block;
     default:
       // All system menu blocks.
       $system_menus = menu_list_system_menus();
diff --git a/modules/user/user.module b/modules/user/user.module
index a59a7146d..29b43cb36 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -2851,10 +2851,8 @@ function user_register() {
     drupal_goto('user/' . $user->uid);
   }
 
-  $form = array();
-
-  // Merge in the default user edit fields.
-  $form = array_merge($form, user_edit_form($form_state, NULL, NULL, TRUE));
+  // Start with the default user edit fields.
+  $form = user_edit_form($form_state, NULL, NULL, TRUE);
   if ($admin) {
     $form['account']['notify'] = array(
      '#type' => 'checkbox',