Ticket #33587: 33587.6.diff

src/wp-admin/includes/user.php

@@ -175 +175 @@
         if ( $update ) {
                 $user_id = wp_update_user( $user );
         } else {
-                $user_id = wp_insert_user( $user );
-                wp_new_user_notification( $user_id, 'both' );
+                $user_id = wp_insert_user( $user, true );
         }
         return $user_id;
 }
@@ -503 +502 @@
 
 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
+}

src/wp-admin/network/site-new.php

@@ -90 +90 @@
         $user_id = email_exists($email);
         if ( !$user_id ) { // Create a new user with a random password
                 $password = wp_generate_password( 12, false );
-                $user_id = wpmu_create_user( $domain, $password, $email );
+                $user_id = wpmu_create_user( $domain, $password, $email, true );
                 if ( false === $user_id )
                         wp_die( __( 'There was an error creating the user.' ) );
-                else
-                        wp_new_user_notification( $user_id, 'both' );
         }
 
         $wpdb->hide_errors();

src/wp-admin/network/site-users.php

@@ -72 +72 @@
                                 $update = 'err_new';
                         } else {
                                 $password = wp_generate_password( 12, false);
-                                $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
+                                $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ), true );
 
                                 if ( false === $user_id ) {
                                         $update = 'err_new_dup';
                                 } else {
-                                        wp_new_user_notification( $user_id, 'both' );
                                         add_user_to_blog( $id, $user_id, $_POST['new_role'] );
                                         $update = 'newuser';
                                 }

src/wp-admin/network/user-new.php

@@ -46 +46 @@
                 $add_user_errors = $user_details[ 'errors' ];
         } else {
                 $password = wp_generate_password( 12, false);
-                $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, sanitize_email( $user['email'] ) );
+                $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, sanitize_email( $user['email'] ), true );
 
                 if ( ! $user_id ) {
                         $add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
                 } else {
-                        wp_new_user_notification( $user_id, 'both' );
                         wp_redirect( add_query_arg( array('update' => 'added'), 'user-new.php' ) );
                         exit;
                 }

src/wp-includes/default-filters.php

@@ -338 +338 @@
 add_action( 'comment_post', 'wp_new_comment_notify_moderator', 10, 2 );
 add_action( 'comment_post', 'wp_new_comment_notify_postauthor' );
 add_action( 'after_password_reset', 'wp_password_change_notification' );
+add_action( 'user_register', 'wp_maybe_send_new_user_notifications', 10, 2 );
 
 /**
  * Filters formerly mixed into wp-includes

src/wp-includes/ms-functions.php

@@ -1106 +1106 @@
  * @param string $user_name The new user's login name.
  * @param string $password  The new user's password.
  * @param string $email     The new user's email address.
+ * @param bool   $notify    Whether to notify the admin and user. Default: false.
  * @return int|false Returns false on failure, or int $user_id on success
  */
-function wpmu_create_user( $user_name, $password, $email ) {
+function wpmu_create_user( $user_name, $password, $email, $notify = false ) {
         $user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
 
-        $user_id = wp_create_user( $user_name, $password, $email );
+        $user_id = wp_create_user( $user_name, $password, $email, $notify );
         if ( is_wp_error( $user_id ) )
                 return false;
 

src/wp-includes/user-functions.php

@@ -1205 +1205 @@
  *                                             site's frontend. Default true.
  *     @type string      $role                 User's role.
  * }
+ * @param bool $notify Whether to send email notifications to the admin and new user. Default: false.
  * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not
  *                      be created.
  */
-function wp_insert_user( $userdata ) {
+function wp_insert_user( $userdata, $notify = false ) {
         global $wpdb;
 
         if ( $userdata instanceof stdClass ) {
@@ -1478 +1479 @@
                  * Fires immediately after a new user is registered.
                  *
                  * @since 1.5.0
+                 * @since 4.4.0 Added `$notify` parameter.
                  *
                  * @param int $user_id User ID.
                  */
-                do_action( 'user_register', $user_id );
+                do_action( 'user_register', $user_id, $notify );
         }
 
         return $user_id;
@@ -1720 +1722 @@
  * @param string $username The user's username.
  * @param string $password The user's password.
  * @param string $email    Optional. The user's email. Default empty.
+ * @param bool   $notify   Whether to notify the admin and new user via email. Default: false.
  * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not
  *                      be created.
  */
-function wp_create_user($username, $password, $email = '') {
+function wp_create_user( $username, $password, $email = '', $notify = false ) {
         $user_login = wp_slash( $username );
         $user_email = wp_slash( $email    );
         $user_pass = $password;
 
         $userdata = compact('user_login', 'user_email', 'user_pass');
-        return wp_insert_user($userdata);
+        return wp_insert_user( $userdata, $notify );
 }
 
 /**
@@ -2004 +2007 @@
                 return $errors;
 
         $user_pass = wp_generate_password( 12, false );
-        $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
+        $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email, true );
         if ( ! $user_id || is_wp_error( $user_id ) ) {
                 $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );
                 return $errors;
@@ -2012 +2015 @@
 
         update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag.
 
-        wp_new_user_notification( $user_id, 'both' );
-
         return $user_id;
 }
 
 /**
+ * Initiate email notifications related to the creation of new users, if necessary.
+ *
+ * Notifications are sent both to the site admin and to the newly created user.
+ *
+ * @since 4.4.0
+ *
+ * @param int  $user_id ID of the newly created user.
+ * @param bool $notify  Whether to send the notification. Passed from the `$notify` param of `wp_insert_user()`.
+ */
+function wp_maybe_send_new_user_notifications( $user_id, $notify ) {
+        if ( $notify ) {
+                wp_new_user_notification( $user_id, 'both' );
+        }
+}
+
+/**
  * Retrieve the current session token from the logged_in cookie.
  *
  * @since 4.0.0