Changeset 27837

Timestamp:

03/29/2014 06:07:17 AM (12 years ago)

Author:

nacin

Message:

Avoid infinite recursion in get_term_children() when a term is incorrectly a parent of itself.

props kovshenin.
fixes #27123.

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

@@ -1108 +1108 @@
 
         foreach ( (array) $terms[$term_id] as $child ) {
+                if ( $term_id == $child ) {
+                        continue;
+                }
+
                 if ( isset($terms[$child]) )
                         $children = array_merge($children, get_term_children($child, $taxonomy));

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

@@ -334 +334 @@
                 $this->assertEquals( 1, count( $terms ) );
         }
+
+        /**
+         * @ticket 27123
+         */
+        function test_get_term_children_recursion() {
+                // Assume there is a way to insert a term with the parent pointing to itself
+                // See: https://core.trac.wordpress.org/changeset/15806
+                remove_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10 );
+
+                $term = wp_insert_term( 'Test', 'category' );
+                $term = wp_update_term( $term['term_id'], 'category', array( 'parent' => $term['term_id'] ) );
+                $term = get_term( $term['term_id'], 'category' );
+
+                $this->assertEquals( $term->term_id, $term->parent );
+                $this->assertInternalType( 'array', get_term_children( $term->term_id, 'category' ) );
+
+                add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
+        }
 }