Changeset 50947

Timestamp:

05/21/2021 10:48:53 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Text Changes: Improve the wording of some error messages.

Props dartiss, williampatton, johnbillion, SergeyBiryukov.
Fixes #50382.

Location:

trunk/src/wp-includes

Files:

• load.php (modified) (1 diff)
• pluggable.php (modified) (2 diffs)
• rest-api.php (modified) (1 diff)

trunk/src/wp-includes/load.php

@@ -1588 +1588 @@
             array(
                 'code'    => 'scrape_nonce_failure',
-                'message' => __( 'Scrape nonce check failed. Please try again.' ),
+                'message' => __( 'Scrape key check failed. Please try again.' ),
             )
         );

trunk/src/wp-includes/pluggable.php

@@ -1177 +1177 @@
     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' );
         }
 
@@ -1222 +1222 @@
     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' );
         }
 

trunk/src/wp-includes/rest-api.php

@@ -1013 +1013 @@
 
     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 ) );
     }