Ticket #25284: 25284.diff

tests/phpunit/tests/term/query.php

@@ -62 +62 @@
 
                 $this->assertEquals( array( $image_id ), $posts );
         }
-}
- No newline at end of file
+
+        /**
+         * @ticket 25284
+         */
+        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' );
+
+                $results = $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] ), $results, 'Relation: OR; Operator: AND' );
+
+                $results = $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] ), $results, 'Relation: AND; Operator: IN' );
+        }
+}

src/wp-includes/taxonomy.php

@@ -769 +769 @@
          * @param array &$query The single query
          */
         private function clean_query( &$query ) {
-                if ( ! taxonomy_exists( $query['taxonomy'] ) ) {
+                global $wpdb;
+
+                if ( empty( $query['taxonomy'] ) ) {
+                        if ( 'term_taxonomy_id' !== $query['field'] ) {
+                                $query = new WP_Error( 'Invalid taxonomy' );
+                                return;
+                        }
+                }
+                elseif ( ! taxonomy_exists( $query['taxonomy'] ) ) {
                         $query = new WP_Error( 'Invalid taxonomy' );
                         return;
                 }
 
                 $query['terms'] = array_unique( (array) $query['terms'] );
 
-                if ( is_taxonomy_hierarchical( $query['taxonomy'] ) && $query['include_children'] ) {
-                        $this->transform_query( $query, 'term_id' );
-
-                        if ( is_wp_error( $query ) )
+                if ( $query['include_children'] ) {
+                        if ( ! empty( $query['taxonomy'] ) && ! is_taxonomy_hierarchical( $query['taxonomy'] ) )
                                 return;
 
+                        if ( ! empty( $query['taxonomy'] ) ) {
+                                $this->transform_query( $query, 'term_id' );
+
+                                if ( is_wp_error( $query ) )
+                                        return;
+                        }
+
                         $children = array();
                         foreach ( $query['terms'] as $term ) {
-                                $children = array_merge( $children, get_term_children( $term, $query['taxonomy'] ) );
+                                if ( empty( $query['taxonomy'] ) ) {
+                                        $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT tt.taxonomy FROM $wpdb->term_taxonomy AS tt WHERE tt.term_taxonomy_id = %d", $term ) );
+
+                                        if ( $taxonomy )
+                                                $children = array_merge( $children, get_term_children( $term, $taxonomy ) );
+                                }
+                                else {
+                                        $children = array_merge( $children, get_term_children( $term, $query['taxonomy'] ) );
+                                }
+
                                 $children[] = $term;
                         }
                         $query['terms'] = $children;