Changeset 48367

Timestamp:

07/07/2020 09:54:27 AM (6 years ago)

Author:

SergeyBiryukov

Message:

REST API: Correct the check for $version argument in rest_handle_doing_it_wrong().

Move WP_REST_Response and WP_Error class names out of the translatable string.

Follow-up to [48327], [48361].

See #36271.

Location:

trunk/src/wp-includes

Files:

• functions.php (modified) (2 diffs)
• rest-api.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -4040 +4040 @@
 function wp_send_json( $response, $status_code = null ) {
         if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
-                _doing_it_wrong( __FUNCTION__, __( 'Return a WP_REST_Response or WP_Error object from your callback when using the REST API.' ), '5.5.0' );
+                _doing_it_wrong(
+                        __FUNCTION__,
+                        sprintf(
+                                /* translators: 1: WP_REST_Response, 2: WP_Error */
+                                __( 'Return a %1$s or %2$s object from your callback when using the REST API.' ),
+                                'WP_REST_Response',
+                                'WP_Error'
+                        ),
+                        '5.5.0'
+                );
         }
 
@@ -5185 +5194 @@
                         trigger_error(
                                 sprintf(
-                                        /* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message, 3: Version information message. */
+                                        /* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message, 3: WordPress version number. */
                                         __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ),
                                         $function,

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

@@ -589 +589 @@
                 return;
         }
-        if ( ! empty( $message ) ) {
+        if ( $message ) {
                 /* translators: 1: Function name, 2: WordPress version number, 3: Error message. */
                 $string = sprintf( __( '%1$s (since %2$s; %3$s)' ), $function, $version, $message );
@@ -614 +614 @@
         }
 
-        if ( is_null( $version ) ) {
-                /* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message */
+        if ( $version ) {
+                /* translators: Developer debugging message. 1: PHP function name, 2: WordPress version number, 3: Explanatory message. */
+                $string = __( '%1$s (since %2$s; %3$s)' );
+                $string = sprintf( $string, $function, $version, $message );
+        } else {
+                /* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message. */
                 $string = __( '%1$s (%2$s)' );
                 $string = sprintf( $string, $function, $message );
-        } else {
-                /* translators: Developer debugging message. 1: PHP function name, 2: Version information message, 3: Explanatory message. */
-                $string = __( '%1$s (since %2$s; %3$s)' );
-                $string = sprintf( $string, $function, $version, $message );
         }