Changeset 47046 for trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

Timestamp:

01/06/2020 05:07:52 PM (4 years ago)

Author:

SergeyBiryukov

Message:

REST API: Display the actual conflicting value in addition to the taxonomy name in the _doing_it_wrong() message for a conflicting rest_base or name property.

Follow-up to [47037] and [47045].

Props TimothyBlynJacobs.
See #48401.

File:

• trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php (modified) (1 diff)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

@@ -2250 +2250 @@
                     'register_taxonomy',
                     sprintf(
-                        /* translators: 1. The taxonomy name, 2. The property name, either 'rest_base' or 'name'. */
-                        __( 'The "%1$s" taxonomy "%2$s" conflicts with an existing property on the REST API Posts Controller. Specify a custom "rest_base" when registering the taxonomy to avoid this error.' ),
+                        /* translators: 1. The taxonomy name, 2. The property name, either 'rest_base' or 'name', 3. The conflicting value. */
+                        __( 'The "%1$s" taxonomy "%2$s" property (%3$s) conflicts with an existing property on the REST API Posts Controller. Specify a custom "rest_base" when registering the taxonomy to avoid this error.' ),
                         $taxonomy->name,
-                        $taxonomy_field_name_with_conflict
+                        $taxonomy_field_name_with_conflict,
+                        $base
                     ),
                     '5.4.0'