Changeset 63065

Timestamp:

08/06/2026 03:38:58 PM (2 months ago)

Author:

johnbillion

Message:

Users: Ensure a proper email address is used before sending email confirmations.

Props xknown, westonruter, jeremyfelt, peterwilsoncc, paulkevan, lucasbustamante, jorbin, desrosj.

Location:

trunk/src

Files:

• wp-admin/includes/user.php (modified) (3 diffs)
• wp-includes/user.php (modified) (4 diffs)

trunk/src/wp-admin/includes/user.php

@@ -45 +45 @@
         }
 
+        $errors = new WP_Error();
+
         $pass1 = '';
         $pass2 = '';
@@ -79 +81 @@
 
         if ( isset( $_POST['email'] ) ) {
-                $user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
+                $maybe_email = wp_unslash( $_POST['email'] );
+                if ( is_string( $maybe_email ) && is_email( $maybe_email ) ) {
+                        $user->user_email = $maybe_email;
+                } else {
+                        $errors->add( 'invalid_email', __( '<strong>Error:</strong> The email address is not correct.' ), array( 'form-field' => 'email' ) );
+                }
         }
         if ( isset( $_POST['url'] ) ) {
@@ -146 +153 @@
                 $user->use_ssl = 1;
         }
-
-        $errors = new WP_Error();
 
         /* checking that username has been typed */

trunk/src/wp-includes/user.php

@@ -3859 +3859 @@
  * @since 3.0.0
  * @since 4.9.0 This function was moved from wp-admin/includes/ms.php so it's no longer Multisite specific.
+ * @since 7.0.3 Added the `$user_id` parameter, which is sent with the `personal_options_update` action.
+ *
+ * @param int $user_id Optional. The ID of the user whose email is being changed. Defaults to `$_POST['user_id']` if set, otherwise 0.
  *
  * @global WP_Error $errors WP_Error object.
  */
-function send_confirmation_on_profile_email() {
+function send_confirmation_on_profile_email( $user_id = 0 ) {
         global $errors;
+
+        // Maintain backward compatibility for those relying on a check based on $_POST['user_id'].
+        if ( ! $user_id && isset( $_POST['user_id'] ) ) {
+                $user_id = absint( $_POST['user_id'] );
+        }
 
         $current_user = wp_get_current_user();
@@ -3870 +3878 @@
         }
 
-        if ( $current_user->ID !== (int) $_POST['user_id'] ) {
+        if ( 0 === $current_user->ID || $current_user->ID !== (int) $user_id ) {
                 return false;
         }
@@ -3884 +3892 @@
                         );
 
+                        $_POST['email'] = addslashes( $current_user->user_email );
                         return;
                 }
@@ -3897 +3906 @@
                         delete_user_meta( $current_user->ID, '_new_email' );
 
+                        $_POST['email'] = addslashes( $current_user->user_email );
                         return;
                 }