Changeset 31284

Timestamp:

01/26/2015 06:08:59 PM (12 years ago)

Author:

boonebgorges

Message:

Ensure that 'pad_counts' is not discarded when the first of multiple taxonomies passed to get_terms() is non-hierarchical.

See #31118.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -1630 +1630 @@
 
         // 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 ) ) ) {
+        $has_hierarchical_tax = false;
+        foreach ( $taxonomies as $_tax ) {
+                if ( is_taxonomy_hierarchical( $_tax ) ) {
+                        $has_hierarchical_tax = true;
+                }
+        }
+
+        if ( ! $has_hierarchical_tax ) {
                 $args['hierarchical'] = false;
                 $args['pad_counts'] = false;
@@ -1964 +1971 @@
         // Update term counts to include children.
         if ( $args['pad_counts'] && 'all' == $_fields ) {
-                _pad_term_counts( $terms, reset( $taxonomies ) );
+                foreach ( $taxonomies as $_tax ) {
+                        _pad_term_counts( $terms, $_tax );
+                }
         }
         // Make sure we show empty categories that have children.

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

@@ -1350 +1350 @@
         }
 
+        /**
+         * @ticket 31118
+         */
+        public function test_pad_counts_should_work_when_first_taxonomy_is_nonhierarchical_and_second_taxonomy_is_hierarchical() {
+                register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => false ) );
+                register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );
+
+                $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+                $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+                $t3 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t2 ) );
+
+                $posts = $this->factory->post->create_many( 3 );
+                wp_set_object_terms( $posts[0], $t1, 'wptests_tax1' );
+                wp_set_object_terms( $posts[1], $t2, 'wptests_tax2' );
+                wp_set_object_terms( $posts[2], $t3, 'wptests_tax2' );
+
+                $found = get_terms( array( 'wptests_tax1', 'wptests_tax2' ), array(
+                        'pad_counts' => true,
+                ) );
+
+                $this->assertEqualSets( array( $t1, $t2, $t3 ), wp_list_pluck( $found, 'term_id' ) );
+
+                foreach ( $found as $f ) {
+                        if ( $t1 == $f->term_id ) {
+                                $this->assertEquals( 1, $f->count );
+                        } elseif ( $t2 == $f->term_id ) {
+                                $this->assertEquals( 2, $f->count );
+                        } else {
+                                $this->assertEquals( 1, $f->count );
+                        }
+                }
+        }
+
         protected function create_hierarchical_terms_and_posts() {
                 $terms = array();