summaryrefslogtreecommitdiff
path: root/modules/user/user.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-04-30 21:44:20 +0000
committerDries Buytaert <dries@buytaert.net>2009-04-30 21:44:20 +0000
commit5f08579bfe3b268d6a57fd50c16de861f72e02e7 (patch)
tree6fef5481becd1767dbf10e61a70b039ba764a2ef /modules/user/user.module
parent3e81a14a4908aca99874484159e25dd88b8d3ecb (diff)
downloadbrdo-5f08579bfe3b268d6a57fd50c16de861f72e02e7.tar.gz
brdo-5f08579bfe3b268d6a57fd50c16de861f72e02e7.tar.bz2
- Patch #240873 by Gábor Hojtsy, sun: block system clean-ups. Thanks for the review sun.
Diffstat (limited to 'modules/user/user.module')
-rw-r--r--modules/user/user.module6
1 files changed, 2 insertions, 4 deletions
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',