Ticket #39697: 39697-concept.patch

wp-includes/user.php

@@ -1870 +1870 @@
  * cleared.
  *
  * @since 2.0.0
+ * @since 5.x.x Added $args parameter.
  *
  * @see wp_insert_user() For what fields can be set in $userdata.
  *
  * @param array|object|WP_User $userdata An array of user data or a user object of type stdClass or WP_User.
+ * @param array $args {
+ *     An array of arguments.
+ *
+ *     @type bool $send_password_change_email Send email if password is changed?
+ *     @type bool $send_email_change_email    Send email if email is changed?
+ * }
  * @return int|WP_Error The updated user's ID or a WP_Error object if the user could not be updated.
  */
 function wp_update_user( $userdata ) {
@@ -1883 +1890 @@
                 $userdata = $userdata->to_array();
         }
 
+        $defaults = array(
+                'send_password_change_email' => true,
+                'send_email_change_email'    => true,
+        );
+
+        $args = wp_parse_args( $args, $defaults );
+
         $ID = isset( $userdata['ID'] ) ? (int) $userdata['ID'] : 0;
         if ( ! $ID ) {
                 return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
@@ -1920 +1934 @@
                  * @param array $user     The original user array.
                  * @param array $userdata The updated user array.
                  */
-                $send_password_change_email = apply_filters( 'send_password_change_email', true, $user, $userdata );
+                $send_password_change_email = apply_filters( 'send_password_change_email', (bool) $args['send_password_change_email'], $user, $userdata );
         }
 
         if ( isset( $userdata['user_email'] ) && $user['user_email'] !== $userdata['user_email'] ) {
@@ -1935 +1949 @@
                  * @param array $user     The original user array.
                  * @param array $userdata The updated user array.
                  */
-                $send_email_change_email = apply_filters( 'send_email_change_email', true, $user, $userdata );
+                $send_email_change_email = apply_filters( 'send_email_change_email', (bool) $args['send_email_change_email'], $user, $userdata );
         }
 
         wp_cache_delete( $user['user_email'], 'useremail' );