Changeset 28562

Timestamp:

05/23/2014 07:58:52 PM (11 years ago)

Author:

wonderboymusic

Message:

When adding queries to tax_query: if the query's field is term_taxonomy_id, don't require taxonomy to be specified. In WP_Tax_Query::transform_query(), $query['taxonomy'] is never checked for the 'term_taxonomy_id' case because 'term_taxonomy_id' is the primary key being looked up.

Adds unit tests.

Props helen.
Fixes #25284.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (2 diffs)
• tests/phpunit/tests/term/query.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -633 +633 @@
     /**
      * List of taxonomy queries. A single taxonomy query is an associative array:
-     * - 'taxonomy' string The taxonomy being queried
+     * - 'taxonomy' string The taxonomy being queried. Optional when using the term_taxonomy_id field.
      * - 'terms' string|array The list of terms
      * - 'field' string (optional) Which term field is being used.
-     *      Possible values: 'term_id', 'slug' or 'name'
+     *      Possible values: 'term_id', 'slug', 'name', or 'term_taxonomy_id'
      *      Default: 'term_id'
      * - 'operator' string (optional)
      *      Possible values: 'AND', 'IN' or 'NOT IN'.
      *      Default: 'IN'
-     * - 'include_children' bool (optional) Whether to include child terms.
+     * - 'include_children' bool (optional) Whether to include child terms. Requires that a taxonomy be specified.
      *      Default: true
      *
@@ -819 +819 @@
      */
     private function clean_query( &$query ) {
-        if ( ! taxonomy_exists( $query['taxonomy'] ) ) {
+        if ( empty( $query['taxonomy'] ) ) {
+            if ( 'term_taxonomy_id' !== $query['field'] ) {
+                $query = new WP_Error( 'Invalid taxonomy' );
+                return;
+            }
+
+            // so long as there are shared terms, include_children requires that a taxonomy is set
+            $query['include_children'] = false;
+        } elseif ( ! taxonomy_exists( $query['taxonomy'] ) ) {
             $query = new WP_Error( 'Invalid taxonomy' );
             return;

trunk/tests/phpunit/tests/term/query.php

@@ -99 +99 @@
         $this->assertEquals( array( $post_id1, $post_id2 ), $ids );
     }
+
+    function test_tax_query_no_taxonomy() {
+        $cat_id = $this->factory->category->create( array( 'name' => 'alpha' ) );
+        $this->factory->post->create( array( 'post_title' => 'alpha', 'post_category' => array( $cat_id ) ) );
+
+        $response1 = new WP_Query( array(
+            'tax_query' => array(
+                array( 'terms' => array( $cat_id ) )
+            )
+        ) );
+        $this->assertEmpty( $response1->posts );
+
+        $response2 = new WP_Query( array(
+            'tax_query' => array(
+                array(
+                    'taxonomy' => 'category',
+                    'terms' => array( $cat_id )
+                )
+            )
+        ) );
+        $this->assertNotEmpty( $response2->posts );
+
+        $term = get_category( $cat_id );
+        $response3 = new WP_Query( array(
+            'tax_query' => array(
+                array(
+                    'field' => 'term_taxonomy_id',
+                    'terms' => array( $term->term_taxonomy_id )
+                )
+            )
+        ) );
+        $this->assertNotEmpty( $response3->posts );
+    }
+
+    function test_term_taxonomy_id_field_no_taxonomy() {
+        $posts = $this->factory->post->create_many( 5 );
+
+        $cats = $tags = array();
+
+        // need term_taxonomy_ids in addition to term_ids, so no factory
+        for ( $i = 0; $i < 5; $i++ ) {
+            $cats[$i] = wp_insert_term( 'category-' . $i , 'category' );
+            $tags[$i] = wp_insert_term( 'tag-' . $i, 'post_tag' );
+
+            // post 0 gets all terms
+            wp_set_object_terms( $posts[0], array( $cats[$i]['term_id'] ), 'category', true );
+            wp_set_object_terms( $posts[0], array( $tags[$i]['term_id'] ), 'post_tag', true );
+        }
+
+        wp_set_object_terms( $posts[1], array( $cats[0]['term_id'], $cats[2]['term_id'], $cats[4]['term_id'] ), 'category' );
+        wp_set_object_terms( $posts[1], array( $tags[0]['term_id'], $tags[2]['term_id'], $cats[4]['term_id'] ), 'post_tag' );
+
+        wp_set_object_terms( $posts[2], array( $cats[1]['term_id'], $cats[3]['term_id'] ), 'category' );
+        wp_set_object_terms( $posts[2], array( $tags[1]['term_id'], $tags[3]['term_id'] ), 'post_tag' );
+
+        wp_set_object_terms( $posts[3], array( $cats[0]['term_id'], $cats[2]['term_id'], $cats[4]['term_id'] ), 'category' );
+        wp_set_object_terms( $posts[3], array( $tags[1]['term_id'], $tags[3]['term_id'] ), 'post_tag' );
+
+        $results1 = $this->q->query( array(
+            'fields' => 'ids',
+            'orderby' => 'id',
+            'order' => 'ASC',
+            'tax_query' => array(
+                'relation' => 'OR',
+                array(
+                    'field' => 'term_taxonomy_id',
+                    'terms' => array( $cats[0]['term_taxonomy_id'], $cats[2]['term_taxonomy_id'], $cats[4]['term_taxonomy_id'], $tags[0]['term_taxonomy_id'], $tags[2]['term_taxonomy_id'], $cats[4]['term_taxonomy_id'] ),
+                    'operator' => 'AND',
+                    'include_children' => false,
+                ),
+                array(
+                    'field' => 'term_taxonomy_id',
+                    'terms' => array( $cats[1]['term_taxonomy_id'], $cats[3]['term_taxonomy_id'], $tags[1]['term_taxonomy_id'], $tags[3]['term_taxonomy_id'] ),
+                    'operator' => 'AND',
+                    'include_children' => false,
+                )
+            )
+        ) );
+
+        $this->assertEquals( array( $posts[0], $posts[1], $posts[2] ), $results1, 'Relation: OR; Operator: AND' );
+
+        $results2 = $this->q->query( array(
+            'fields' => 'ids',
+            'orderby' => 'id',
+            'order' => 'ASC',
+            'tax_query' => array(
+                'relation' => 'AND',
+                array(
+                    'field' => 'term_taxonomy_id',
+                    'terms' => array( $cats[0]['term_taxonomy_id'], $tags[0]['term_taxonomy_id'] ),
+                    'operator' => 'IN',
+                    'include_children' => false,
+                ),
+                array(
+                    'field' => 'term_taxonomy_id',
+                    'terms' => array( $cats[3]['term_taxonomy_id'], $tags[3]['term_taxonomy_id'] ),
+                    'operator' => 'IN',
+                    'include_children' => false,
+                )
+            )
+        ) );
+
+        $this->assertEquals( array( $posts[0], $posts[3] ), $results2, 'Relation: AND; Operator: IN' );
+    }
 }