diff --git a/wp-includes/version.php b/wp-includes/version.php index 4c329ea967..f08f2d74c6 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.2-alpha-44930'; +$wp_version = '5.2-alpha-44931'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-login.php b/wp-login.php index b02a2b9e70..464e4ed73f 100644 --- a/wp-login.php +++ b/wp-login.php @@ -853,17 +853,16 @@ switch ( $action ) { case 'confirmaction': if ( ! isset( $_GET['request_id'] ) ) { - wp_die( __( 'Invalid request.' ) ); + wp_die( __( 'Missing request ID.' ) ); + } + + if ( ! isset( $_GET['confirm_key'] ) ) { + wp_die( __( 'Missing confirm key.' ) ); } $request_id = (int) $_GET['request_id']; - - 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' ) ); - } + $key = sanitize_text_field( wp_unslash( $_GET['confirm_key'] ) ); + $result = wp_validate_user_request_key( $request_id, $key ); if ( is_wp_error( $result ) ) { wp_die( $result );