Ticket #33358: 33358.4.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 );
+                wp_new_user_notification( $user_id, 'both' );
         }
         return $user_id;
 }

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

@@ -79 +79 @@
                 if ( false === $user_id )
                         wp_die( __( 'There was an error creating the user.' ) );
                 else
-                        wp_new_user_notification( $user_id, $password );
+                        wp_new_user_notification( $user_id, 'both' );
         }
 
         $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, $password );
+                                        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

@@ -51 +51 @@
                 if ( ! $user_id ) {
                         $add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
                 } else {
-                        wp_new_user_notification( $user_id, $password );
+                        wp_new_user_notification( $user_id, 'both' );
                         wp_redirect( add_query_arg( array('update' => 'added'), 'user-new.php' ) );
                         exit;
                 }

src/wp-includes/pluggable.php

@@ -1689 +1689 @@
  *
  * @since 2.0.0
  *
- * @param int    $user_id        User ID.
+ * @param int    $user_id User ID.
+ * @param string $notify  Whether admin and user should be notified ('both') or
+ *                        only the admin ('admin' or empty).
  */
-function wp_new_user_notification($user_id) {
+function wp_new_user_notification( $user_id, $notify = '' ) {
         global $wpdb;
         $user = get_userdata( $user_id );
 
@@ -1705 +1707 @@
 
         @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
 
+        if ( 'admin' === $notify || empty( $notify ) ) {
+                return;
+        }
+
         // Generate something random for a password reset key.
         $key = wp_generate_password( 20, false );
 
+        /** This action is documented in wp-login.php */
         do_action( 'retrieve_password_key', $user->user_login, $key );
 
         // Now insert the key, hashed, into the DB.

src/wp-includes/user.php

@@ -2619 +2619 @@
 
         update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag.
 
-        wp_new_user_notification( $user_id );
+        wp_new_user_notification( $user_id, 'both' );
 
         return $user_id;
 }