Changeset 29891 for trunk/src/wp-includes/query.php

Timestamp:

10/14/2014 04:02:41 AM (9 years ago)

Author:

boonebgorges

Message:

Introduce support for nested queries in WP_Tax_Query.

Previously, tax query arguments could be joined by a single AND or OR relation.
Now, these queries can be arbitrarily nested, allowing clauses to be linked
together with multiple relations.

In a few places, WP_Query runs through a list of clauses in a tax_query in order
to set certain query vars for backward compatibility. The necessary changes have
been made to WP_Query to support this feature with the new complex structure of
tax_query. Unit tests are included for these backward compatibility fixes.

Unit tests for the new nesting syntax are included.

Props boonebgorges.
Fixes #29718. See #29738.

File:

• trunk/src/wp-includes/query.php (modified) (3 diffs)

trunk/src/wp-includes/query.php

@@ -1673 +1673 @@
 
             foreach ( $this->tax_query->queries as $tax_query ) {
-                if ( 'NOT IN' != $tax_query['operator'] ) {
+                if ( ! is_array( $tax_query ) ) {
+                    continue;
+                }
+
+                if ( isset( $tax_query['operator'] ) && 'NOT IN' != $tax_query['operator'] ) {
                     switch ( $tax_query['taxonomy'] ) {
                         case 'category':
@@ -2688 +2692 @@
                 // Do a fully inclusive search for currently registered post types of queried taxonomies
                 $post_type = array();
-                $taxonomies = wp_list_pluck( $this->tax_query->queries, 'taxonomy' );
+                $taxonomies = array_keys( $this->tax_query->queried_terms );
                 foreach ( get_post_types( array( 'exclude_from_search' => false ) ) as $pt ) {
                     $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies( $pt );
@@ -2705 +2709 @@
         }
 
-        // Back-compat
-        if ( !empty($this->tax_query->queries) ) {
-            $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );
-            if ( !empty( $tax_query_in_and ) ) {
-                if ( !isset( $q['taxonomy'] ) ) {
-                    foreach ( $tax_query_in_and as $a_tax_query ) {
-                        if ( !in_array( $a_tax_query['taxonomy'], array( 'category', 'post_tag' ) ) ) {
-                            $q['taxonomy'] = $a_tax_query['taxonomy'];
-                            if ( 'slug' == $a_tax_query['field'] )
-                                $q['term'] = $a_tax_query['terms'][0];
-                            else
-                                $q['term_id'] = $a_tax_query['terms'][0];
-
-                            break;
+        /*
+         * Ensure that 'taxonomy', 'term', 'term_id', 'cat', and
+         * 'category_name' vars are set for backward compatibility.
+         */
+        if ( ! empty( $this->tax_query->queried_terms ) ) {
+
+            /*
+             * Set 'taxonomy', 'term', and 'term_id' to the
+             * first taxonomy other than 'post_tag' or 'category'.
+             */
+            if ( ! isset( $q['taxonomy'] ) ) {
+                foreach ( $this->tax_query->queried_terms as $queried_taxonomy => $queried_items ) {
+                    if ( empty( $queried_items['terms'][0] ) ) {
+                        continue;
+                    }
+
+                    if ( ! in_array( $queried_taxonomy, array( 'category', 'post_tag' ) ) ) {
+                        $q['taxonomy'] = $queried_taxonomy;
+
+                        if ( 'slug' === $queried_items['field'] ) {
+                            $q['term'] = $queried_items['terms'][0];
+                        } else {
+                            $q['term_id'] = $queried_items['terms'][0];
                         }
                     }
                 }
-
-                $cat_query = wp_list_filter( $tax_query_in_and, array( 'taxonomy' => 'category' ) );
-                if ( ! empty( $cat_query ) ) {
-                    $cat_query = reset( $cat_query );
-
-                    if ( ! empty( $cat_query['terms'][0] ) ) {
-                        $the_cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );
-                        if ( $the_cat ) {
-                            $this->set( 'cat', $the_cat->term_id );
-                            $this->set( 'category_name', $the_cat->slug );
-                        }
-                        unset( $the_cat );
+            }
+
+            // 'cat', 'category_name', 'tag_id'
+            foreach ( $this->tax_query->queried_terms as $queried_taxonomy => $queried_items ) {
+                if ( empty( $queried_items['terms'][0] ) ) {
+                    continue;
+                }
+
+                if ( 'category' === $queried_taxonomy ) {
+                    $the_cat = get_term_by( $queried_items['field'], $queried_items['terms'][0], 'category' );
+                    if ( $the_cat ) {
+                        $this->set( 'cat', $the_cat->term_id );
+                        $this->set( 'category_name', $the_cat->slug );
                     }
+                    unset( $the_cat );
                 }
-                unset( $cat_query );
-
-                $tag_query = wp_list_filter( $tax_query_in_and, array( 'taxonomy' => 'post_tag' ) );
-                if ( ! empty( $tag_query ) ) {
-                    $tag_query = reset( $tag_query );
-
-                    if ( ! empty( $tag_query['terms'][0] ) ) {
-                        $the_tag = get_term_by( $tag_query['field'], $tag_query['terms'][0], 'post_tag' );
-                        if ( $the_tag )
-                            $this->set( 'tag_id', $the_tag->term_id );
-                        unset( $the_tag );
+
+                if ( 'post_tag' === $queried_taxonomy ) {
+                    $the_tag = get_term_by( $queried_items['field'], $queried_items['terms'][0], 'post_tag' );
+                    if ( $the_tag ) {
+                        $this->set( 'tag_id', $the_tag->term_id );
                     }
+                    unset( $the_tag );
                 }
-                unset( $tag_query );
             }
         }