<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[31248] trunk: Better loop detection for `_pad_term_counts()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31248">31248</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31248","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-19 16:51:44 +0000 (Mon, 19 Jan 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Better loop detection for `_pad_term_counts()`.
The `$ancestors` check must be reset for each term in order for term counts
to be correct.
Fixes <a href="https://core.trac.wordpress.org/ticket/20635">#20635</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermsphp">trunk/tests/phpunit/tests/term/getTerms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2015-01-19 15:30:09 UTC (rev 31247)
+++ trunk/src/wp-includes/taxonomy.php 2015-01-19 16:51:44 UTC (rev 31248)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3920,20 +3920,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Touch every ancestor's lookup row for each post in each term
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ancestors = array();
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $term_ids as $term_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ancestors[] = $term_id;
</del><span class="cx" style="display: block; padding: 0 10px"> $child = $term_id;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ancestors = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> while ( !empty( $terms_by_id[$child] ) && $parent = $terms_by_id[$child]->parent ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $parent, $ancestors ) ) {
- break;
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ancestors[] = $child;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $term_items[$term_id] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $term_items[$term_id] as $item_id => $touches ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term_items[$parent][$item_id] = isset($term_items[$parent][$item_id]) ? ++$term_items[$parent][$item_id]: 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $child = $parent;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( in_array( $parent, $ancestors ) ) {
+ break;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/getTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTerms.php 2015-01-19 15:30:09 UTC (rev 31247)
+++ trunk/tests/phpunit/tests/term/getTerms.php 2015-01-19 16:51:44 UTC (rev 31248)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1077,7 +1077,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_pad_counts() {
+ register_taxonomy( 'wptests_tax_1', 'post', array( 'hierarchical' => true ) );
+
+ $posts = $this->factory->post->create_many( 3 );
+
+ $t1 = $this->factory->term->create( array(
+ 'taxonomy' => 'wptests_tax_1',
+ ) );
+ $t2 = $this->factory->term->create( array(
+ 'taxonomy' => 'wptests_tax_1',
+ 'parent' => $t1,
+ ) );
+ $t3 = $this->factory->term->create( array(
+ 'taxonomy' => 'wptests_tax_1',
+ 'parent' => $t2,
+ ) );
+
+ wp_set_object_terms( $posts[0], array( $t1 ), 'wptests_tax_1' );
+ wp_set_object_terms( $posts[1], array( $t2 ), 'wptests_tax_1' );
+ wp_set_object_terms( $posts[2], array( $t3 ), 'wptests_tax_1' );
+
+ $found = get_terms( 'wptests_tax_1', array(
+ 'pad_counts' => true,
+ ) );
+
+ $this->assertEqualSets( array( $t1, $t2, $t3 ), wp_list_pluck( $found, 'term_id' ) );
+
+ foreach ( $found as $f ) {
+ if ( $t1 == $f->term_id ) {
+ $this->assertSame( 3, $f->count );
+ } elseif ( $t2 == $f->term_id ) {
+ $this->assertSame( 2, $f->count );
+ } else {
+ $this->assertSame( 1, $f->count );
+ }
+ }
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20635
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_pad_counts_should_not_recurse_infinitely_when_term_hierarchy_has_a_loop() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1100,6 +1138,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $c1, $c2, $c3 ), wp_list_pluck( $terms, 'term_id' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ foreach ( $terms as $term ) {
+ $this->assertSame( 3, $term->count );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> protected function create_hierarchical_terms_and_posts() {
</span></span></pre>
</div>
</div>
</body>
</html>