sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
props kovshenin.
fixes #27123.


git-svn-id: https://develop.svn.wordpress.org/trunk@27837 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2014-03-29 06:07:17 +00:00
parent 0ad35e169b
commit 05ea231402
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/taxonomy.php
View File

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

18
tests/phpunit/tests/term/getTerms.php
View File

@ -333,4 +333,22 @@ class Tests_Term_getTerms extends WP_UnitTestCase {
$terms = get_terms( 'category', array( 'child_of' => $parent, 'hide_empty' => false ) ); $terms = get_terms( 'category', array( 'child_of' => $parent, 'hide_empty' => false ) );
$this->assertEquals( 1, count( $terms ) ); $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 );
}
} }