Ticket #33587: 33587.5.diff

src/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, 'both' );
+                /**
+                  * Fires after a new user has been created.
+                  *
+                  * @since 4.4.0
+                  *
+                  * @param int $user_id ID of the newly created user.
+                  */
+                do_action( 'edit_user_created_user', $user_id );
         }
         return $user_id;
 }
@@ -503 +510 @@
 
 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

@@ -91 +91 @@
         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 );
-                if ( false === $user_id )
+                if ( false === $user_id ) {
                         wp_die( __( 'There was an error creating the user.' ) );
-                else
-                        wp_new_user_notification( $user_id, 'both' );
+                }
+
+                /**
+                  * Fires after a new user has been created via the network site-new.php page.
+                  *
+                  * @since 4.4.0
+                  *
+                  * @param int $user_id ID of the newly created user.
+                  */
+                do_action( 'network_site_new_created_user', $user_id );
         }
 
         $wpdb->hide_errors();

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

@@ -77 +77 @@
                                 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';
+                                        /**
+                                          * Fires after a user has been created via the network site-users.php page.
+                                          *
+                                          * @since 4.4.0
+                                          *
+                                          * @param int $user_id ID of the newly created user.
+                                          */
+                                        do_action( 'network_site_users_created_user', $user_id );
                                 }
                         }
                         break;

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

@@ -51 +51 @@
                 if ( ! $user_id ) {
                         $add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
                 } else {
-                        wp_new_user_notification( $user_id, 'both' );
+                        /**
+                          * Fires after a new user has been created.
+                          *
+                          * @since 4.4.0
+                          *
+                          * @param int $user_id ID of the newly created user.
+                          */
+                        do_action( 'network_user_new_created_user', $user_id );
                         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( 'register_new_user',      'wp_send_new_user_notifications' );
+add_action( 'edit_user_created_user', 'wp_send_new_user_notifications' );
 
 /**
  * Filters formerly mixed into wp-includes

src/wp-includes/ms-default-filters.php

@@ -27 +27 @@
 add_action( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 );
 add_action( 'wpmu_activate_user', 'wpmu_welcome_user_notification', 10, 3 );
 add_action( 'after_signup_user', 'wpmu_signup_user_notification', 10, 4 );
+add_action( 'network_site_new_created_user',   'wp_send_new_user_notifications' );
+add_action( 'network_site_users_created_user', 'wp_send_new_user_notifications' );
+add_action( 'network_user_new_created_user',   'wp_send_new_user_notifications' );
 add_filter( 'sanitize_user', 'strtolower' );
 
 // Blogs

src/wp-includes/user-functions.php

@@ -2012 +2012 @@
 
         update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag.
 
-        wp_new_user_notification( $user_id, 'both' );
+        /**
+         * Fires after a new user registration has been recorded.
+         *
+         * @since 4.4.0
+         *
+         * @param int $user_id ID of the newly registered user.
+         */
+        do_action( 'register_new_user', $user_id );
 
         return $user_id;
 }
 
 /**
+ * Initiate email notifications related to the creation of new users.
+ *
+ * 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.
+ */
+function wp_send_new_user_notifications( $user_id ) {
+        wp_new_user_notification( $user_id, 'both' );
+}
+
+/**
  * Retrieve the current session token from the logged_in cookie.
  *
  * @since 4.0.0