Ticket #44901: 44901.diff

src/wp-login.php

@@ -878 +878 @@
                         wp_die( __( 'Invalid request.' ) );
                 }
 
+                if ( ! isset( $_GET['request_id'] ) ) {
+                        wp_die( __( 'Missing confirm key.' ) );
+                }
+
                 $request_id = (int) $_GET['request_id'];
+                $key            = sanitize_text_field( wp_unslash( $_GET['confirm_key'] ) );
+                $result         = wp_validate_user_request_key( $request_id, $key );
 
-                if ( isset( $_GET['confirm_key'] ) ) {
-                        $key    = sanitize_text_field( wp_unslash( $_GET['confirm_key'] ) );
-                        $result = wp_validate_user_request_key( $request_id, $key );
-                } else {
-                        $result = new WP_Error( 'invalid_key', __( 'Invalid key' ) );
-                }
-
                 if ( is_wp_error( $result ) ) {
                         wp_die( $result );
                 }