From 35be5138e9e989bba415e827e1e2f91c01d340e8 Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Thu, 6 Oct 2016 01:30:30 +0000 Subject: [PATCH] Docs: Improvements to `register_taxonomy()` docblock. * Fix spelling and whitespace. * Remove `$label` argument documentation. This argument hasn't worked since [14614], despite the documentation added in [14619]. Props bobbingwide. Fixes #38007. Built from https://develop.svn.wordpress.org/trunk@38737 git-svn-id: http://core.svn.wordpress.org/trunk@38680 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/taxonomy.php | 12 +++++------- wp-includes/version.php | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 4edae370c1..73b769cbc9 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -293,16 +293,14 @@ function is_taxonomy_hierarchical($taxonomy) { * @global WP $wp WP instance. * * @param string $taxonomy Taxonomy key, must not exceed 32 characters. - * @param array|string $object_type Name of the object type for the taxonomy object. + * @param array|string $object_type Object type or array of object types with which the taxonomy should be associated. * @param array|string $args { * Optional. Array or query string of arguments for registering a taxonomy. * - * @type string $label Name of the taxonomy shown in the menu. Usually plural. If not set, - * `$labels['name']` will be used. - * @type array $labels An array of labels for this taxonomy. By default, Tag labels are used for - * non-hierarchical taxonmies, and Category labels are used for hierarchical - * taxonomies. See accepted values in get_taxonomy_labels(). - * Default empty array. + * @type array $labels An array of labels for this taxonomy. By default, Tag labels are + * used for non-hierarchical taxonomies, and Category labels are used + * for hierarchical taxonomies. See accepted values in + * get_taxonomy_labels(). Default empty array. * @type string $description A short descriptive summary of what the taxonomy is for. Default empty. * @type bool $public Whether a taxonomy is intended for use publicly either via * the admin interface or by front-end users. The default settings diff --git a/wp-includes/version.php b/wp-includes/version.php index 39ffa9de5c..70f676fdd5 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38736'; +$wp_version = '4.7-alpha-38737'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.