Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-22 15:31:42 +01:00
Code Issues Projects Releases Wiki Activity

REST API: Display the taxonomy name in the _doing_it_wrong() message for a conflicting rest_base or name property, to match the translator comment.

Browse Source 
Follow-up to [47037].

See #48401.
Built from https://develop.svn.wordpress.org/trunk@47045


git-svn-id: http://core.svn.wordpress.org/trunk@46845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-01-06 16:47:02 +00:00
parent 28639fc8d5
commit a540d748d3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
View File

@ -2249,9 +2249,9 @@ 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. */
/* 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.' ),
$base,
$taxonomy->name,
$taxonomy_field_name_with_conflict
),
'5.4.0'

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.4-alpha-47044';
$wp_version = '5.4-alpha-47045';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.