Changeset 30265

Timestamp:

11/06/2014 09:46:18 PM (12 years ago)

Author:

boonebgorges

Message:

Don't force child_of=0 for non-hierarchical taxonomies in get_terms().

This forcing appears to have been introduced to save unnecessary queries, but
(a) in some cases it appeared to be causing *more* queries, and (b) it caused
incorrect results when the 'exclude_tree' param of get_terms() called
get_terms() on each item in the tree using the 'child_of' param.

Fixes #30275.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -1650 +1650 @@
         // Save queries by not crawling the tree in the case of multiple taxes or a flat tax.
         if ( ! $single_taxonomy || ! is_taxonomy_hierarchical( reset( $taxonomies ) ) ) {
-                $args['child_of'] = false;
                 $args['hierarchical'] = false;
                 $args['pad_counts'] = false;

trunk/tests/phpunit/tests/term/getTerms.php

@@ -172 +172 @@
                 get_terms( 'post_tag', array( 'include' => array( 'unexpected-string' ), 'hide_empty' => false ) );
                 $this->assertEmpty( $wpdb->last_error );
+        }
+
+        /**
+         * @ticket 30275
+         */
+        public function test_exclude_with_hierarchical_true_for_non_hierarchical_taxonomy() {
+                register_taxonomy( 'wptests_tax', 'post' );
+
+                $terms = $this->factory->term->create_many( 2, array(
+                        'taxonomy' => 'wptests_tax',
+                ) );
+
+                $found = get_terms( 'wptests_tax', array(
+                        'taxonomy' => 'wptests_tax',
+                        'hide_empty' => false,
+                        'exclude_tree' => array( $terms[0] ),
+                        'hierarchical' => true,
+                ) );
+
+                $this->assertEquals( array( $terms[1] ), wp_list_pluck( $found, 'term_id' ) );
+
+                _unregister_taxonomy( 'wptests_tax' );
         }