fixed hierarchy inside select; added 'match' behavior;

inc/base.abstract.php

@@ -22,17 +22,31 @@ public function __construct()
 
 	public function setup_vars()
 	{
-		! isset( $this->post_type )   AND $this->post_type   = get_current_screen()->post_type;
-		! isset( $this->taxonomies )  AND $this->taxonomies  = array_diff(
+		! isset( $this->post_type )  AND $this->post_type   = get_current_screen()->post_type;
+		! isset( $this->taxonomies ) AND $this->taxonomies  = array_diff(
 			 get_object_taxonomies( $this->post_type )
 			,get_taxonomies( array(
 				'show_admin_column' => false
 			 ) )
 		);
-		! isset( $this->post_status ) AND $this->post_status = get_post_stati( array(
-			 'show_in_admin_status_list' => true
-			,'show_in_admin_all_list'    => true
-		) );
+		if ( ! isset( $this->post_status ) )
+		{
+			$args = array(
+				 'private'                   => false
+				,'internal'                  => false
+				,'exclude_from_search'       => false
+				,'show_in_admin_all_list'    => true
+				,'show_in_admin_status_list' => true
+			);
+			current_user_can(
+				get_post_type_object( $this->post_type )
+					->cap
+					->read_private_posts
+			)
+				AND $args['private'] = true;
+
+			$this->post_status = get_post_stati( $args );
+		}
 	}
 
 	abstract function setup_actions();

inc/filter.class.php

@@ -45,14 +45,20 @@ public function get_markup()
 					? selected( $term->slug, $_GET[ $tax ], false )
 					: ''
 				;
-				$parent = '0' !== $term->parent ?: true;
+				$parent = false;
+				if (
+					0 >= absint( $term->parent )
+					OR ! is_taxonomy_hierarchical( $tax )
+				)
+					$parent = true;
+
 				$options .= sprintf(
 					 '<option class="level-%s" value="%s" %s>%s%s</option>'
 					,! $parent ? '1' : '0'
 					,$term->slug
 					,$selected
 					,! $parent ? str_repeat( '&nbsp;', 3 ) : ''
-					,"{$term->name} ({$term->count})"
+					,"{$term->name} <sup>({$term->count})</sup>"
 				);
 			}
 			$html .= sprintf(

inc/match.class.php

@@ -18,7 +18,7 @@ public static function init()
 
 	public function setup_actions()
 	{
-		add_filter( 'posts_where' , array( $this, 'set_where' ) );
+		add_filter( 'pre_get_posts', array( $this, 'tax_filter' ) );
 	}
 
 	public function get_markup()
@@ -32,23 +32,14 @@ public function get_markup()
 		return print "{$html}  ";
 	}
 
-	public function set_where( $where )
+	public function tax_filter( &$query )
 	{
-		global $wpdb;
-		$tt_ids = $this->get_tax_ids();
-		if ( empty( $tt_ids ) )
-			return $where;
-		$where .= $wpdb->prepare(
-			" AND ID IN (
-			    SELECT object_id
-			    FROM {$wpdb->term_relationships}
-			    WHERE term_taxonomy_id
-			    IN (%d)
-			 )"
-			,join( ",", $tt_ids )
+		property_exists( $query->tax_query, 'queries' ) AND $tax_query = array_merge(
+			 $query->tax_query->queries
+			,array( 'relation' => 'OR' )
 		);
-
-		return $where;
+		$query->set( 'tax_query', $tax_query );
+		return $query;
 	}
 
 # ====== HELPER