Changeset 30771

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.

Location:

trunk

Files:

• src/wp-includes/query.php (modified) (1 diff)
• tests/phpunit/tests/query/taxQuery.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 );
                     }
                 }

trunk/tests/phpunit/tests/query/taxQuery.php

@@ -181 +181 @@
         ) );
     }
+
+    /**
+     * @group 30623
+     */
+    public function test_get_queried_object_with_custom_taxonomy_tax_query_and_field_term_id_should_return_term_object() {
+        // Don't override the args provided below.
+        remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_tax_category_tax_query' ) );
+
+        $args = array(
+            'tax_query' => array(
+                'relation' => 'AND',
+                array(
+                    'taxonomy' => 'testtax',
+                    'field' => 'term_id',
+                    'terms' => array(
+                        $this->tax_id,
+                    ),
+                ),
+            )
+        );
+
+        $q = new WP_Query( $args );
+        $object = $q->get_queried_object();
+
+        $expected = get_term( $this->tax_id, 'testtax' );
+
+        $this->assertEquals( $expected, $object );
+    }
+
+    /**
+     * @group 30623
+     */
+    public function test_get_queried_object_with_custom_taxonomy_tax_query_and_field_slug_should_return_term_object() {
+        // Don't override the args provided below.
+        remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_tax_category_tax_query' ) );
+
+        $args = array(
+            'tax_query' => array(
+                'relation' => 'AND',
+                array(
+                    'taxonomy' => 'testtax',
+                    'field' => 'slug',
+                    'terms' => array(
+                        'tax-slug',
+                    ),
+                ),
+            )
+        );
+
+        $q = new WP_Query( $args );
+        $object = $q->get_queried_object();
+
+        $expected = get_term( $this->tax_id, 'testtax' );
+
+        // Only compare term_id because object_id may or may not be part of either value.
+        $this->assertEquals( $expected->term_id, $object->term_id );
+    }
+
+    /**
+     * @group 30623
+     */
+    public function test_get_queried_object_with_custom_taxonomy_tax_query_with_multiple_clauses_should_return_term_object_corresponding_to_the_first_queried_tax() {
+        // Don't override the args provided below.
+        remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_tax_category_tax_query' ) );
+
+        register_taxonomy( 'testtax2', 'post' );
+        $testtax2_term_id = $this->factory->term->create( array(
+            'taxonomy' => 'testtax2',
+            'slug' => 'testtax2-slug',
+        ) );
+
+        $args = array(
+            'tax_query' => array(
+                'relation' => 'AND',
+                array(
+                    'taxonomy' => 'testtax',
+                    'field' => 'slug',
+                    'terms' => array(
+                        'tax-slug',
+                    ),
+                ),
+                array(
+                    'taxonomy' => 'testtax2',
+                    'field' => 'slug',
+                    'terms' => array(
+                        'testtax2-slug',
+                    ),
+                ),
+            )
+        );
+
+        $q = new WP_Query( $args );
+        $object = $q->get_queried_object();
+
+        $expected = get_term( $this->tax_id, 'testtax' );
+
+        // Only compare term_id because object_id may or may not be part of either value.
+        $this->assertEquals( $expected->term_id, $object->term_id );
+    }
 }