Ticket #50382: 50382.diff

src/wp-includes/load.php

@@ -1587 +1587 @@
                 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 ######";

src/wp-includes/pluggable.php

@@ -1176 +1176 @@
          */
         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 +1221 @@
          */
         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 = '';

src/wp-includes/rest-api.php

@@ -1012 +1012 @@
         $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.