Changeset 31206

Timestamp:

01/16/2015 04:45:21 PM (12 years ago)

Author:

boonebgorges

Message:

Bail out of hierarchy loops in _pad_term_counts().

Taxonomy hierarchy loops should not occur naturally, but when they do, the
logic of _pad_term_counts() could result in infinite loops, leading to
timeouts. We avoid this by breaking when a loop is detected.

Fixes #20635.

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

@@ -3917 +3917 @@
 
         // 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;
                 while ( !empty( $terms_by_id[$child] ) && $parent = $terms_by_id[$child]->parent ) {
+                        if ( in_array( $parent, $ancestors ) ) {
+                                break;
+                        }
+
                         if ( !empty( $term_items[$term_id] ) )
                                 foreach ( $term_items[$term_id] as $item_id => $touches ) {

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

@@ -1038 +1038 @@
                 $actual = wp_list_pluck( $terms, 'term_id' );
                 $this->assertEqualSets( $expected, $actual );
+        }
+
+        /*
+         * @ticket 20635
+         */
+        public function test_pad_counts_should_not_recurse_infinitely_when_term_hierarchy_has_a_loop() {
+                remove_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10 );
+
+                $c1 = $this->factory->category->create();
+                $c2 = $this->factory->category->create( array( 'parent' => $c1 ) );
+                $c3 = $this->factory->category->create( array( 'parent' => $c2 ) );
+                wp_update_term( $c1, 'category', array( 'parent' => $c3 ) );
+
+                add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
+
+                $posts = $this->factory->post->create_many( 3 );
+                wp_set_post_terms( $posts[0], $c1, 'category' );
+                wp_set_post_terms( $posts[1], $c2, 'category' );
+                wp_set_post_terms( $posts[2], $c3, 'category' );
+
+                $terms = get_terms( 'category', array(
+                        'pad_counts' => true,
+                ) );
+
+                $this->assertEqualSets( array( $c1, $c2, $c3 ), wp_list_pluck( $terms, 'term_id' ) );
         }