From f216d9c73adfca317d0a8225f564225e97825cff Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 6 Jan 2020 17:07:52 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@47046 602fd350-edb4-49c9-b593-d223f7449a82 --- .../rest-api/endpoints/class-wp-rest-posts-controller.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php index 511cb34efa..ffac007c82 100644 --- a/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php +++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php @@ -2249,10 +2249,11 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { _doing_it_wrong( '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' );