WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Taxonomy: Correct the initial value for `WP_Taxonomy::$labels` to match `get_taxonomy_labels()` return type. 

Improve documentation for consistency with `WP_Post_Type::$labels`.

Props alpipego.
Fixes #48681.
Built from https://develop.svn.wordpress.org/trunk@46743


git-svn-id: http://core.svn.wordpress.org/trunk@46543 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-11-18 07:58:59 +00:00
parent 5aa3a51264
commit f32831bf6d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/class-wp-taxonomy.php
View File

@ -30,12 +30,17 @@ final class WP_Taxonomy {
public $label; public $label;
/** /**
* An array of labels for this taxonomy. * Labels object for this taxonomy.
*
* If not set, tag labels are inherited for non-hierarchical types
* and category labels for hierarchical ones.
*
* @see get_taxonomy_labels()
* *
* @since 4.7.0 * @since 4.7.0
* @var object * @var object
*/ */
public $labels = array(); public $labels;
/** /**
* A short descriptive summary of what the taxonomy is for. * A short descriptive summary of what the taxonomy is for.

2
wp-includes/version.php
View File

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