From 5f08579bfe3b268d6a57fd50c16de861f72e02e7 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 30 Apr 2009 21:44:20 +0000
Subject: =?UTF-8?q?-=20Patch=20#240873=20by=20G=C3=A1bor=20Hojtsy,=20sun:?=
 =?UTF-8?q?=20block=20system=20clean-ups.=20=20Thanks=20for=20the=20review?=
 =?UTF-8?q?=20sun.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/user/user.module | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'modules/user/user.module')

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',
-- 
cgit v1.2.3