Ticket #33504: 33504.3.diff

wp-admin/includes/user.php

@@ -176 +176 @@
                 $user_id = wp_update_user( $user );
         } else {
                 $user_id = wp_insert_user( $user );
-                wp_new_user_notification( $user_id, null, 'both' );
+                wp_new_user_notification( $user_id, null, isset( $_POST['send_reset_link'] ) ? 'both' : 'admin' );
         }
         return $user_id;
 }
@@ -503 +503 @@
 
 Please click the following link to activate your user account:
 %%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) );
-}
- No newline at end of file
+}

wp-admin/user-new.php

@@ -368 +368 @@
 $new_user_email = $creating && isset( $_POST['email'] ) ? wp_unslash( $_POST['email'] ) : '';
 $new_user_uri = $creating && isset( $_POST['url'] ) ? wp_unslash( $_POST['url'] ) : '';
 $new_user_role = $creating && isset( $_POST['role'] ) ? wp_unslash( $_POST['role'] ) : '';
-$new_user_send_password = $creating && isset( $_POST['send_password'] ) ? wp_unslash( $_POST['send_password'] ) : true;
+$send_reset_link = $creating && ! isset( $_POST['send_reset_link'] ) ? false : true;
 $new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unslash( $_POST['noconfirmation'] ) : '';
 
 ?>
@@ -445 +445 @@
                         </label>
                 </td>
         </tr>
+        <tr>
+                <th scope="row"><label for="send_reset_link"><?php _e('') ?></label></th>
+                <td><label for="send_reset_link"><input type="checkbox" name="send_reset_link" id="send_reset_link" value="admin" <?php checked( $send_reset_link ); ?> /> <?php _e('Send a link to the new user by email so they can choose their own password.'); ?></label></td>
+        </tr>
 <?php endif; ?>
 <?php } // !is_multisite ?>
         <tr class="form-field">