From 977e81b1a1b9f89677da4c0681c94d291c17e55c Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 21 May 2021 10:49:57 +0000 Subject: [PATCH] Text Changes: Improve the wording of some error messages. Props dartiss, williampatton, johnbillion, SergeyBiryukov. Fixes #50382. Built from https://develop.svn.wordpress.org/trunk@50947 git-svn-id: http://core.svn.wordpress.org/trunk@50556 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/load.php | 2 +- wp-includes/pluggable.php | 4 ++-- wp-includes/rest-api.php | 2 +- wp-includes/version.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-includes/load.php b/wp-includes/load.php index 0ea926c9dd..16c4b55c9a 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -1587,7 +1587,7 @@ function wp_start_scraping_edited_file_errors() { echo wp_json_encode( array( 'code' => 'scrape_nonce_failure', - 'message' => __( 'Scrape nonce check failed. Please try again.' ), + 'message' => __( 'Scrape key check failed. Please try again.' ), ) ); echo "###### wp_scraping_result_end:$key ######"; diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index 18480c219a..68e24b11ec 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -1176,7 +1176,7 @@ if ( ! function_exists( 'check_admin_referer' ) ) : */ function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) { if ( -1 === $action ) { - _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' ); + _doing_it_wrong( __FUNCTION__, __( 'You should specify an action to be verified by using the first parameter.' ), '3.2.0' ); } $adminurl = strtolower( admin_url() ); @@ -1221,7 +1221,7 @@ if ( ! function_exists( 'check_ajax_referer' ) ) : */ function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) { if ( -1 == $action ) { - _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '4.7' ); + _doing_it_wrong( __FUNCTION__, __( 'You should specify an action to be verified by using the first parameter.' ), '4.7' ); } $nonce = ''; diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php index 49eb1bbfd4..fef8f2ef10 100644 --- a/wp-includes/rest-api.php +++ b/wp-includes/rest-api.php @@ -1012,7 +1012,7 @@ function rest_cookie_check_errors( $result ) { $result = wp_verify_nonce( $nonce, 'wp_rest' ); if ( ! $result ) { - return new WP_Error( 'rest_cookie_invalid_nonce', __( 'Cookie nonce is invalid' ), array( 'status' => 403 ) ); + return new WP_Error( 'rest_cookie_invalid_nonce', __( 'Cookie check failed' ), array( 'status' => 403 ) ); } // Send a refreshed nonce in header. diff --git a/wp-includes/version.php b/wp-includes/version.php index 88ab383617..e8f651b4c0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.8-alpha-50946'; +$wp_version = '5.8-alpha-50947'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.