Ticket #15456: user-new-form-updates.diff

wp-admin/user-new.php

@@ -222 +222 @@
                 $label = __('E-mail or Username');
         }
 ?>
-<form action="#add-existing-user" method="post" name="adduser" id="adduser" class="add:users: validate"<?php do_action('user_new_form_tag');?>>
+<form action="" method="post" name="adduser" id="adduser" class="add:users: validate"<?php do_action('user_new_form_tag');?>>
 <input name="action" type="hidden" id="action" value="adduser" />
 <?php wp_nonce_field('add-user') ?>
+<?php
+// Load up the passed data, else set to a default.
+foreach ( array('email' => 'email', 'role' => 'role') as $post_field => $var ) {
+        $var = "existing_user_$var";
+                $$var = false;
+}
+$existing_user_ignore_pass = '';
+?>
+
 <table class="form-table">
         <tr class="form-field form-required">
                 <th scope="row"><label for="email"><?php echo $label; ?></label></th>
-                <td><input name="email" type="text" id="email" value="<?php echo esc_attr($new_user_email); ?>" /></td>
+                <td><input name="email" type="text" id="email" value="<?php echo esc_attr($existing_user_email); ?>" /></td>
         </tr>
         <tr class="form-field">
                 <th scope="row"><label for="role"><?php _e('Role'); ?></label></th>
                 <td><select name="role" id="role">
                         <?php
-                        if ( !$new_user_role )
-                                $new_user_role = !empty($current_role) ? $current_role : get_option('default_role');
-                        wp_dropdown_roles($new_user_role);
+                        if ( !$existing_user_role )
+                                $existing_user_role = !empty($current_role) ? $current_role : get_option('default_role');
+                        wp_dropdown_roles($existing_user_role);
                         ?>
                         </select>
                 </td>
@@ -244 +253 @@
 <?php if ( is_super_admin() ) { ?>
         <tr>
                 <th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
-                <td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
+                <td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1"  <?php checked($existing_user_ignore_pass, true); ?> /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
         </tr>
 <?php } ?>
 </table>
@@ -258 +267 @@
                 echo '<h3 id="create-new-user">' . __('Create New User') . '</h3>';
 ?>
 <p><?php _e('Create a brand new user and add it to this site.'); ?></p>
-<form action="#create-new-user" method="post" name="createuser" id="adduser" class="add:users: validate"<?php do_action('user_new_form_tag');?>>
+<form action="" method="post" name="createuser" id="adduser" class="add:users: validate"<?php do_action('user_new_form_tag');?>>
 <input name="action" type="hidden" id="action" value="createuser" />
 <?php wp_nonce_field('create-user') ?>
 <?php
@@ -266 +275 @@
 foreach ( array('user_login' => 'login', 'first_name' => 'firstname', 'last_name' => 'lastname',
                                 'email' => 'email', 'url' => 'uri', 'role' => 'role') as $post_field => $var ) {
         $var = "new_user_$var";
-        if ( ! isset($$var) )
-                $$var = isset($_POST[$post_field]) ? stripslashes($_POST[$post_field]) : '';
+        if(isset($_POST['createuser'])) {
+                if ( ! isset($$var) )
+                        $$var = isset($_POST[$post_field]) ? stripslashes($_POST[$post_field]) : '';
+        } else {
+                $$var = '';
+        }
 }
-$new_user_send_password = !$_POST || isset($_POST['send_password']);
+if(isset($_POST['createuser'])) {
+        $new_user_send_password = !$_POST || isset($_POST['send_password']);
+        $new_user_ignore_pass = !$_POST || isset($_POST['noconfirmation']);
+} else {
+        $new_user_send_password = '';
+        $new_user_ignore_pass = '';
+}
 ?>
 <table class="form-table">
         <tr class="form-field form-required">
@@ -324 +343 @@
         <?php if ( is_multisite() && is_super_admin() ) { ?>
         <tr>
                 <th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
-                <td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
+                <td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1"  <?php checked($new_user_ignore_pass, true); ?> /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
         </tr>
         <?php } ?>
 </table>