Changeset 48367 for trunk/src/wp-includes/rest-api.php

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.

File:

• trunk/src/wp-includes/rest-api.php (modified) (2 diffs)

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 );
         }