From b18755172bd4137f593dfbd892cb8fad2ec11be3 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Tue, 20 Oct 2015 04:56:57 +0000
Subject: [PATCH] Widgets: revert [34376] and [34386] as pertains to the
 Categories widget supporting custom taxonomies.

Punting on 4th down.

See #21165.


git-svn-id: https://develop.svn.wordpress.org/trunk@35278 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/taxonomy-functions.php        |  2 -
 .../widgets/class-wp-widget-categories.php    | 41 +------------------
 2 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/src/wp-includes/taxonomy-functions.php b/src/wp-includes/taxonomy-functions.php
index 22f858da26..655782d41a 100644
--- a/src/wp-includes/taxonomy-functions.php
+++ b/src/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/src/wp-includes/widgets/class-wp-widget-categories.php b/src/wp-includes/widgets/class-wp-widget-categories.php
index 876aa0688f..058fd9007a 100644
--- a/src/wp-includes/widgets/class-wp-widget-categories.php
+++ b/src/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 '<label class="screen-reader-text" for="' . esc_attr( $dropdown_id ) . '">' . $title . '</label>';
 
-			$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 );
 		?>
 		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label>
 		<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
 
-		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'taxonomy' ) ); ?>"><?php _e( 'Taxonomy:' ) ?></label>
-			<select class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'taxonomy' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'taxonomy' ) ); ?>">
-			<?php foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy ) : ?>
-				<?php
-				if ( ! $taxonomy->hierarchical || empty( $taxonomy->labels->name ) ) :
-					continue;
-				endif;
-				?>
-				<option value="<?php echo esc_attr( $taxonomy->name ); ?>" <?php selected( $taxonomy->name, $current_taxonomy ) ?>><?php echo esc_html( $taxonomy->labels->name ); ?></option>
-			<?php endforeach; ?>
-			</select>
-		</p>
-
 		<p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>"<?php checked( $dropdown ); ?> />
 		<label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e( 'Display as dropdown' ); ?></label><br />
 
@@ -189,19 +167,4 @@ class WP_Widget_Categories extends WP_Widget {
 		<?php
 	}
 
-	/**
-	 * Retrieves the taxonomy for the current Categories widget instance.
-	 *
-	 * @since 4.4.0
-	 * @access public
-	 *
-	 * @param array $instance Current settings.
-	 * @return string Name of the current taxonomy if set, otherwise 'category'.
-	 */
-	public function _get_current_taxonomy( $instance ) {
-		if ( ! empty( $instance['taxonomy'] ) && taxonomy_exists( $instance['taxonomy'] ) ) {
-			return $instance['taxonomy'];
-		}
-		return 'category';
-	}
 }