Ticket #31383: User WP_Tax_Query support.patch

wp-includes/user.php

@@ -455 +455 @@
          */
         public $query_vars = array();
 
+        public $tax_query = array();
+
         /**
          * List of found user ids
          *
@@ -569 +571 @@
                                 'meta_key' => '',
                                 'meta_value' => '',
                                 'meta_compare' => '',
+                                'tax_query' => '',
                                 'include' => array(),
                                 'exclude' => array(),
                                 'search' => '',
@@ -619 +622 @@
                 $this->query_from = "FROM $wpdb->users";
                 $this->query_where = "WHERE 1=1";
 
+                //Handle taxonomy queries
+                $this->parse_tax_query( $qv );
+
+                $clauses = $this->tax_query->get_sql( $wpdb->users, 'ID' );
+
+                $this->query_from .= $clauses['join'];
+                $this->query_where .= $clauses['where'];
+
                 // Parse and sanitize 'include', for use by 'orderby' as well as 'include' below.
                 if ( ! empty( $qv['include'] ) ) {
                         $include = wp_parse_id_list( $qv['include'] );
@@ -812 +823 @@
                 do_action_ref_array( 'pre_user_query', array( &$this ) );
         }
 
+        public function parse_tax_query( &$q ) {
+
+                if ( ! empty( $q['tax_query'] ) && is_array( $q['tax_query'] ) ) {
+                        $tax_query = $q['tax_query'];
+                } else {
+                        $tax_query = array();
+                }
+
+                if ( ! empty( $q['taxonomy'] ) && ! empty( $q['term'] ) ) {
+                        $tax_query[] = array(
+                                'taxonomy' => $q['taxonomy'],
+                                'terms' => array( $q['term'] ),
+                                'field' => 'slug',
+                        );
+                }
+
+                foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t ) {
+                        if ( $t->query_var && ! empty( $q[ $t->query_var ] ) ) {
+                                $tax_query_defaults = array(
+                                        'taxonomy' => $taxonomy,
+                                        'field' => 'slug',
+                                );
+
+                                if ( isset( $t->rewrite['hierarchical'] ) && $t->rewrite['hierarchical'] ) {
+                                        $q[ $t->query_var ] = wp_basename( $q[ $t->query_var ] );
+                                }
+
+                                $term = $q[ $t->query_var ];
+
+                                if ( strpos( $term, '+' ) !== false ) {
+                                        $terms = preg_split( '/[+]+/', $term );
+                                        foreach ( $terms as $term ) {
+                                                $tax_query[] = array_merge( $tax_query_defaults, array(
+                                                        'terms' => array( $term )
+                                                ) );
+                                        }
+                                } else {
+                                        $tax_query[] = array_merge( $tax_query_defaults, array(
+                                                'terms' => preg_split( '/[,]+/', $term )
+                                        ) );
+                                }
+                        }
+                }
+
+                $this->tax_query = new WP_Tax_Query( $tax_query );
+
+                /**
+                 * Fires after taxonomy-related query vars have been parsed.
+                 *
+                 * @since
+                 *
+                 * @param WP_Query $this The WP_Query instance.
+                 */
+                do_action( 'parse_user_tax_query', $this );
+        }
+
         /**
          * Execute the query, with the current variables.
          *

wp-admin/menu.php

@@ -213 +213 @@
         }
 
         $submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php');
+
+        foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
+                if ( ! $tax->show_ui || ! $tax->show_in_menu  || ! in_array( 'user', (array) $tax->object_type, true ) ) {
+                        continue;
+                }
+
+                $i = 20;
+
+                $submenu['users.php'][ $i++ ] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name );
+        }
+        unset( $tax );
 } else {
         $_wp_real_parent_file['users.php'] = 'profile.php';
         $submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');