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

Timestamp:

12/07/2014 02:57:53 PM (10 years ago)

Author:

boonebgorges

Message:

In WP_Query::get_queried_object(), use the new format for referencing tax query clauses.

queried_terms, rather than queries, is the tax_query property where a flat
index of terms is stored.

See [29901] for a similar fix in redirect_canonical(). See #29738.

Props dd32.
Fixes #30623.

File:

• trunk/src/wp-includes/query.php (modified) (1 diff)

trunk/src/wp-includes/query.php

@@ -3870 +3870 @@
                 }
             } else {
-                $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );
-                $query = reset( $tax_query_in_and );
+                // For other tax queries, grab the first term from the first clause.
+                $tax_query_in_and = wp_list_filter( $this->tax_query->queried_terms, array( 'operator' => 'NOT IN' ), 'NOT' );
+
+                $queried_taxonomies = array_keys( $tax_query_in_and );
+                $matched_taxonomy = reset( $queried_taxonomies );
+                $query = $tax_query_in_and[ $matched_taxonomy ];
 
                 if ( $query['terms'] ) {
                     if ( 'term_id' == $query['field'] ) {
-                        $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
+                        $term = get_term( reset( $query['terms'] ), $matched_taxonomy );
                     } else {
-                        $term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
+                        $term = get_term_by( $query['field'], reset( $query['terms'] ), $matched_taxonomy );
                     }
                 }