Ticket #33654: 33654.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' );
+                wp_new_user_notification( $user_id, null, '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, 'both' );
+                        wp_new_user_notification( $user_id, null, '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, 'both' );
+                                        wp_new_user_notification( $user_id, null, '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, 'both' );
+                        wp_new_user_notification( $user_id, null, 'both' );
                         wp_redirect( add_query_arg( array('update' => 'added'), 'user-new.php' ) );
                         exit;
                 }

src/wp-includes/pluggable.php

@@ -1690 +1690 @@
  *
  * @since 2.0.0
  * @since 4.3.0 The `$plaintext_pass` parameter was changed to `$notify`.
+ * @since 4.3.1 The `$plaintext_pass` deprecated. `$notify` added as a third argument.
  *
  * @param int    $user_id User ID.
+ * @param bool $deprecated Not used (argument deprecated).
  * @param string $notify  Optional. Type of notification that should happen. Accepts 'admin' or an empty
  *                        string (admin only), or 'both' (admin and user). The empty string value was kept
  *                        for backward-compatibility purposes with the renamed parameter. Default empty.
  */
-function wp_new_user_notification( $user_id, $notify = '' ) {
+function wp_new_user_notification( $user_id, , $deprecated = null, $notify = '' ) {
+        if ( $deprecated !== null ) {
+                _deprecated_argument( __FUNCTION__, '4.3.1' );
+        }
+
         global $wpdb;
         $user = get_userdata( $user_id );
 

src/wp-includes/user-functions.php

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