diff --git a/wp-includes/taxonomy-functions.php b/wp-includes/taxonomy-functions.php index 22f858da26..655782d41a 100644 --- a/wp-includes/taxonomy-functions.php +++ b/wp-includes/taxonomy-functions.php @@ -479,7 +479,6 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) { * * - name - general name for the taxonomy, usually plural. The same as and overridden by $tax->label. Default is Tags/Categories * - singular_name - name for one object of this taxonomy. Default is Tag/Category - * - select_name - prompt to select a taxonomy when using a dropdown list in the Categories widget. Default is 'Select Category'. * - search_items - Default is Search Tags/Search Categories * - popular_items - This string isn't used on hierarchical taxonomies. Default is Popular Tags * - all_items - Default is All Tags/All Categories @@ -520,7 +519,6 @@ function get_taxonomy_labels( $tax ) { $nohier_vs_hier_defaults = array( 'name' => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ), 'singular_name' => array( _x( 'Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ), - 'select_name' => array( null, __( 'Select Category' ) ), 'search_items' => array( __( 'Search Tags' ), __( 'Search Categories' ) ), 'popular_items' => array( __( 'Popular Tags' ), null ), 'all_items' => array( __( 'All Tags' ), __( 'All Categories' ) ), diff --git a/wp-includes/version.php b/wp-includes/version.php index 57dbe55750..62ec2c9f78 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-35277'; +$wp_version = '4.4-alpha-35278'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/widgets/class-wp-widget-categories.php b/wp-includes/widgets/class-wp-widget-categories.php index 876aa0688f..058fd9007a 100644 --- a/wp-includes/widgets/class-wp-widget-categories.php +++ b/wp-includes/widgets/class-wp-widget-categories.php @@ -11,7 +11,6 @@ * Core class used to implement a Categories widget. * * @since 2.8.0 - * @since 4.4.0 Added support for other taxonomies. * * @see WP_Widget */ @@ -41,8 +40,6 @@ class WP_Widget_Categories extends WP_Widget { public function widget( $args, $instance ) { static $first_dropdown = true; - $current_taxonomy = $this->_get_current_taxonomy( $instance ); - /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */ $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title'], $instance, $this->id_base ); @@ -55,13 +52,10 @@ class WP_Widget_Categories extends WP_Widget { echo $args['before_title'] . $title . $args['after_title']; } - $tax = get_taxonomy( $current_taxonomy ); - $cat_args = array( 'orderby' => 'name', 'show_count' => $c, - 'hierarchical' => $h, - 'taxonomy' => $current_taxonomy, + 'hierarchical' => $h ); if ( $d ) { @@ -70,7 +64,7 @@ class WP_Widget_Categories extends WP_Widget { echo ''; - $cat_args['show_option_none'] = $tax->labels->select_name; + $cat_args['show_option_none'] = __( 'Select Category' ); $cat_args['id'] = $dropdown_id; /** @@ -139,7 +133,6 @@ class WP_Widget_Categories extends WP_Widget { $instance['count'] = !empty($new_instance['count']) ? 1 : 0; $instance['hierarchical'] = !empty($new_instance['hierarchical']) ? 1 : 0; $instance['dropdown'] = !empty($new_instance['dropdown']) ? 1 : 0; - $instance['taxonomy'] = stripslashes( $new_instance['taxonomy'] ); return $instance; } @@ -159,25 +152,10 @@ class WP_Widget_Categories extends WP_Widget { $count = isset($instance['count']) ? (bool) $instance['count'] :false; $hierarchical = isset( $instance['hierarchical'] ) ? (bool) $instance['hierarchical'] : false; $dropdown = isset( $instance['dropdown'] ) ? (bool) $instance['dropdown'] : false; - $current_taxonomy = $this->_get_current_taxonomy( $instance ); ?>

-

- - -

-

/>
@@ -189,19 +167,4 @@ class WP_Widget_Categories extends WP_Widget {