Ticket #20635: 20635.3.diff

src/wp-includes/taxonomy.php

@@ -3884 +3884 @@
  *
  * @param array $terms List of Term IDs
  * @param string $taxonomy Term Context
+ * @param array $ancestors List of ancestor terms already referenced. Passed by reference.
  * @return null Will break from function if conditions are not met.
  */
-function _pad_term_counts(&$terms, $taxonomy) {
+function _pad_term_counts( &$terms, $taxonomy ) {
         global $wpdb;
 
         // This function only works for hierarchical taxonomies like post categories.
@@ -3917 +3918 @@
         }
 
         // 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 ) {
                                         $term_items[$parent][$item_id] = isset($term_items[$parent][$item_id]) ? ++$term_items[$parent][$item_id]: 1;

tests/phpunit/tests/term/getTerms.php

@@ -1039 +1039 @@
                 $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' ) );
+        }
+
         protected function create_hierarchical_terms_and_posts() {
                 $terms = array();