- Patch #168437 by stBorchert, gaele: reorder user registration settings so they are more logical.

modules/user/user.admin.inc

@@ -415,48 +415,48 @@ function user_admin_settings() {
     '#rows' => 15,
   );
 
-  $form['email_no_approval_required'] = array(
+  $form['email_pending_approval'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Welcome (no approval required)'),
+    '#title' => t('Welcome (awaiting approval)'),
     '#collapsible' => TRUE,
-    '#collapsed' => (variable_get('user_register', 1) != 1),
-    '#description' => t('Customize welcome e-mail messages sent to new members upon registering, when no administrator approval is required.') . ' ' . $email_token_help,
+    '#collapsed' => (variable_get('user_register', 1) != 2),
+    '#description' => t('Customize welcome e-mail messages sent to new members upon registering, when administrative approval is required.') . ' ' . $email_token_help,
     '#group' => 'email',
   );
-  $form['email_no_approval_required']['user_mail_register_no_approval_required_subject'] = array(
+  $form['email_pending_approval']['user_mail_register_pending_approval_subject'] = array(
     '#type' => 'textfield',
     '#title' => t('Subject'),
-    '#default_value' => _user_mail_text('register_no_approval_required_subject'),
+    '#default_value' => _user_mail_text('register_pending_approval_subject'),
     '#maxlength' => 180,
   );
-  $form['email_no_approval_required']['user_mail_register_no_approval_required_body'] = array(
+  $form['email_pending_approval']['user_mail_register_pending_approval_body'] = array(
     '#type' => 'textarea',
     '#title' => t('Body'),
-    '#default_value' => _user_mail_text('register_no_approval_required_body'),
-    '#rows' => 15,
+    '#default_value' => _user_mail_text('register_pending_approval_body'),
+    '#rows' => 8,
   );
 
-  $form['email_pending_approval'] = array(
+  $form['email_no_approval_required'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Welcome (awaiting approval)'),
+    '#title' => t('Welcome (no approval required)'),
     '#collapsible' => TRUE,
-    '#collapsed' => (variable_get('user_register', 1) != 2),
-    '#description' => t('Customize welcome e-mail messages sent to new members upon registering, when administrative approval is required.') . ' ' . $email_token_help,
+    '#collapsed' => (variable_get('user_register', 1) != 1),
+    '#description' => t('Customize welcome e-mail messages sent to new members upon registering, when no administrator approval is required.') . ' ' . $email_token_help,
     '#group' => 'email',
   );
-  $form['email_pending_approval']['user_mail_register_pending_approval_subject'] = array(
+  $form['email_no_approval_required']['user_mail_register_no_approval_required_subject'] = array(
     '#type' => 'textfield',
     '#title' => t('Subject'),
-    '#default_value' => _user_mail_text('register_pending_approval_subject'),
+    '#default_value' => _user_mail_text('register_no_approval_required_subject'),
     '#maxlength' => 180,
   );
-  $form['email_pending_approval']['user_mail_register_pending_approval_body'] = array(
+  $form['email_no_approval_required']['user_mail_register_no_approval_required_body'] = array(
     '#type' => 'textarea',
     '#title' => t('Body'),
-    '#default_value' => _user_mail_text('register_pending_approval_body'),
-    '#rows' => 8,
+    '#default_value' => _user_mail_text('register_no_approval_required_body'),
+    '#rows' => 15,
   );
-
+  
   $form['email_password_reset'] = array(
     '#type' => 'fieldset',
     '#title' => t('Password recovery'),