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

Bail out of hierarchy loops in _pad_term_counts().

Browse Source 
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.

git-svn-id: https://develop.svn.wordpress.org/trunk@31206 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2015-01-16 16:45:21 +00:00
parent 18dbceee8c
commit 8ae64f6384
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3916,9 +3916,15 @@ function _pad_term_counts(&$terms, $taxonomy) {
}
// 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;

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

@ -1039,6 +1039,31 @@ class Tests_Term_getTerms extends WP_UnitTestCase {
$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();