Ticket #44940: 44940-non-breaking.diff

src/wp-includes/user.php

@@ -4837 +4837 @@
                 $switched_locale = switch_to_locale( get_locale() );
         }
 
+        // Generate new key. See: https://core.trac.wordpress.org/ticket/44940
+        $request->confirm_key = wp_generate_user_request_key( $request_id );
+
         $email_data = array(
                 'request'     => $request,
                 'email'       => $request->email,
@@ -4845 +4848 @@
                         array(
                                 'action'      => 'confirmaction',
                                 'request_id'  => $request_id,
-                                'confirm_key' => wp_generate_user_request_key( $request_id ),
+                                'confirm_key' => $request->confirm_key,
                         ),
                         wp_login_url()
                 ),