Changeset 31248

Timestamp:

01/19/2015 04:51:44 PM (10 years ago)

Author:

boonebgorges

Message:

Better loop detection for _pad_term_counts().

The $ancestors check must be reset for each term in order for term counts
to be correct.

Fixes #20635.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -3921 +3921 @@
 
     // Touch every ancestor's lookup row for each post in each term
-    $ancestors = array();
     foreach ( $term_ids as $term_id ) {
-        $ancestors[] = $term_id;
         $child = $term_id;
+        $ancestors = array();
         while ( !empty( $terms_by_id[$child] ) && $parent = $terms_by_id[$child]->parent ) {
-            if ( in_array( $parent, $ancestors ) ) {
-                break;
-            }
-
+            $ancestors[] = $child;
             if ( !empty( $term_items[$term_id] ) )
                 foreach ( $term_items[$term_id] as $item_id => $touches ) {
@@ -3935 +3931 @@
                 }
             $child = $parent;
+
+            if ( in_array( $parent, $ancestors ) ) {
+                break;
+            }
         }
     }

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

@@ -1078 +1078 @@
     }
 
-    /*
+    public function test_pad_counts() {
+        register_taxonomy( 'wptests_tax_1', 'post', array( 'hierarchical' => true ) );
+
+        $posts = $this->factory->post->create_many( 3 );
+
+        $t1 = $this->factory->term->create( array(
+            'taxonomy' => 'wptests_tax_1',
+        ) );
+        $t2 = $this->factory->term->create( array(
+            'taxonomy' => 'wptests_tax_1',
+            'parent' => $t1,
+        ) );
+        $t3 = $this->factory->term->create( array(
+            'taxonomy' => 'wptests_tax_1',
+            'parent' => $t2,
+        ) );
+
+        wp_set_object_terms( $posts[0], array( $t1 ), 'wptests_tax_1' );
+        wp_set_object_terms( $posts[1], array( $t2 ), 'wptests_tax_1' );
+        wp_set_object_terms( $posts[2], array( $t3 ), 'wptests_tax_1' );
+
+        $found = get_terms( 'wptests_tax_1', 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->assertSame( 3, $f->count );
+            } elseif ( $t2 == $f->term_id ) {
+                $this->assertSame( 2, $f->count );
+            } else {
+                $this->assertSame( 1, $f->count );
+            }
+        }
+    }
+
+    /**
      * @ticket 20635
      */
@@ -1101 +1139 @@
 
         $this->assertEqualSets( array( $c1, $c2, $c3 ), wp_list_pluck( $terms, 'term_id' ) );
+
+        foreach ( $terms as $term ) {
+            $this->assertSame( 3, $term->count );
+        }
     }