Ticket #33504: 33504.6.diff

src/wp-admin/includes/user.php

@@ -176 +176 @@
                 $user_id = wp_update_user( $user );
         } else {
                 $user_id = wp_insert_user( $user );
+                $notify  = ( isset( $_POST['send_reset_link'] ) ) ? 'both' : 'admin';
+
                 /**
                   * Fires after a new user has been created.
                   *
                   * @since 4.4.0
                   *
-                  * @param int $user_id ID of the newly created user.
+                  * @param int    $user_id ID of the newly created user.
+                  * @param string $notify  Type of notification that should happen. See {@see wp_send_new_user_notifications()}
+                  *                        for more information on possible values.
                   */
-                do_action( 'edit_user_created_user', $user_id );
+                do_action( 'edit_user_created_user', $user_id, $notify );
         }
         return $user_id;
 }

src/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;
+$new_user_send_reset_link = $creating && ! isset( $_POST['send_reset_link'] ) ? false : true;
 $new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unslash( $_POST['noconfirmation'] ) : '';
 
 ?>
@@ -436 +436 @@
                         </label>
                 </td>
         </tr>
+        <tr>
+                <th scope="row"><?php _e( 'Send User Notification?' ) ?></th>
+                <td><label for="send_reset_link"><input type="checkbox" name="send_reset_link" id="send_reset_link" value="1" <?php checked( $new_user_send_reset_link ); ?> /> <?php _e( 'Send the new user an email notification about their new account.' ); ?></label></td>
+        </tr>
 <?php } // !is_multisite ?>
         <tr class="form-field">
                 <th scope="row"><label for="role"><?php _e('Role'); ?></label></th>

src/wp-includes/default-filters.php

@@ -357 +357 @@
 add_action( 'comment_post', 'wp_new_comment_notify_postauthor' );
 add_action( 'after_password_reset', 'wp_password_change_notification' );
 add_action( 'register_new_user',      'wp_send_new_user_notifications' );
-add_action( 'edit_user_created_user', 'wp_send_new_user_notifications' );
+add_action( 'edit_user_created_user', 'wp_send_new_user_notifications', 10, 2 );
 
 // REST API actions.
 add_action( 'init',          'rest_api_init' );

src/wp-includes/user.php

@@ -2198 +2198 @@
  *
  * @since 4.4.0
  *
- * @param int $user_id ID of the newly created user.
+ * @param int    $user_id ID of the newly created user.
+ * @param string $notify  Optional. Type of notification that should happen. Accepts 'admin' or an empty string
+ *                        (admin only), or 'both' (admin and user). Default 'both'.
  */
-function wp_send_new_user_notifications( $user_id ) {
-        wp_new_user_notification( $user_id, null, 'both' );
+function wp_send_new_user_notifications( $user_id, $notify = 'both' ) {
+        wp_new_user_notification( $user_id, null, $notify );
 }
 
 /**