Changeset 10990

Timestamp:

05/21/2021 06:12:00 AM (3 years ago)

Author:

dd32

Message:

Registration: When changing the email, ensure that it gets trimmed properly.

Follow up to r10981.
See #5181.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php

@@ -359 +359 @@
 
     $updated_email = false;
+    $new_email     = trim( wp_unslash( $_POST['user_email'] ?? '' ) );
     if (
         'pending' === $state &&
         empty( $pending_user['meta']['changed_email'] ) && // Only if they've not changed it before.
-        ! empty( $_POST['user_email'] ) &&
-        wp_unslash( $_POST['user_email'] ) !== $pending_user['user_email']
+        $new_email &&
+        $new_email !== $pending_user['user_email']
     ) {
         // Validate the email
-        $error_user_email = rest_do_request( new WP_REST_Request( 'GET', '/wporg/v1/email-in-use/' . wp_unslash( $_POST['user_email'] ) ) );
+        $error_user_email = rest_do_request( new WP_REST_Request( 'GET', '/wporg/v1/email-in-use/' . $new_email ) );
         if ( $error_user_email->get_data()['available'] ) {
             // Change their email, resend confirmation.
             $pending_user['meta']['changed_email'] = $pending_user['user_email'];
-            $pending_user['user_email']            = wp_unslash( $_POST['user_email'] );
+            $pending_user['user_email']            = $new_email;
             $pending_user['user_activation_key']   = ''; // Clear any existing email hash.
             $updated_email                         = true;