From bdd183d1eb3f6090fbf1752ad74a2ca1d71d910e Mon Sep 17 00:00:00 2001 From: nacin Date: Fri, 4 Jun 2010 19:21:06 +0000 Subject: [PATCH] Remove 'popular_items' label for hierarchical taxonomies. see [15140], [15141] git-svn-id: http://svn.automattic.com/wordpress/trunk@15142 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/taxonomy.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index fa025f169..2d9b85d88 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -326,7 +326,7 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) { * - name - general name for the taxonomy, usually plural. The same as and overriden by $tax->label. Default is Post Tags/Categories * - singular_name - name for one object of this taxonomy. Default is Post Tag/Category * - search_items - Default is Search Tags/Search Categories - * - popular_items - Default is Popular Tags/Popular Categories + * - popular_items - This string isn't used on hierarchical taxonomies. Default is Popular Tags * - all_items - Default is All Tags/All Categories * - parent_item - This string isn't used on non-hierarchical taxonomies. In hierarchical ones the default is Parent Category * - parent_item_colon - The same as parent_item, but with colon : in the end @@ -347,7 +347,7 @@ function get_taxonomy_labels( $tax ) { 'name' => array( _x( 'Post Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ), 'singular_name' => array( _x( 'Post Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ), 'search_items' => array( __( 'Search Tags' ), __( 'Search Categories' ) ), - 'popular_items' => array( __( 'Popular Tags' ), __( 'Popular Categories' ) ), + 'popular_items' => array( __( 'Popular Tags' ), null ), 'all_items' => array( __( 'All Tags' ), __( 'All Categories' ) ), 'parent_item' => array( null, __( 'Parent Category' ) ), 'parent_item_colon' => array( null, __( 'Parent Category:' ) ),