<!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>[27108] trunk: In `get_terms()`, don't set automatically `hierarchical` to `false` when `parent => 0` is passed.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27108">27108</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-02-06 17:44:50 +0000 (Thu, 06 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>In `get_terms()`, don't set automatically `hierarchical` to `false` when `parent => 0` is passed. The default value for `parent` is `''`.
In `_get_term_children()`, don't skip a top-level term without first including its children in the returned term list. Ironically, the call to `_get_term_children()` in `get_terms()` has a comment stating `"Make sure we show empty categories that have children."`, but it didn't work if you were retrieving top-level categories only.
All unit tests pass. Added a unit test based on the use case described in this ticket.
Fixes <a href="http://core.trac.wordpress.org/ticket/26903">#26903</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>Modified: trunk/src/wp-includes/taxonomy.php (27107 => 27108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/taxonomy.php 2014-02-06 07:07:42 UTC (rev 27107)
+++ trunk/src/wp-includes/taxonomy.php 2014-02-06 17:44:50 UTC (rev 27108)
</span><span class="lines">@@ -1279,7 +1279,7 @@
</span><span class="cx"> $args['number'] = absint( $args['number'] );
</span><span class="cx"> $args['offset'] = absint( $args['offset'] );
</span><span class="cx"> if ( !$single_taxonomy || ! is_taxonomy_hierarchical( reset( $taxonomies ) ) ||
</span><del>- '' !== $args['parent'] ) {
</del><ins>+ ( '' !== $args['parent'] && 0 !== $args['parent'] ) ) {
</ins><span class="cx"> $args['child_of'] = 0;
</span><span class="cx"> $args['hierarchical'] = false;
</span><span class="cx"> $args['pad_counts'] = false;
</span><span class="lines">@@ -3002,8 +3002,18 @@
</span><span class="cx"> $use_id = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $term->term_id == $term_id )
</del><ins>+ if ( $term->term_id == $term_id ) {
+ if ( isset( $has_children[$term_id] ) ) {
+ foreach ( $has_children[$term_id] as $t_id ) {
+ if ( $use_id ) {
+ $term_list[] = $t_id;
+ } else {
+ $term_list[] = get_term( $t_id, $taxonomy );
+ }
+ }
+ }
</ins><span class="cx"> continue;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if ( $term->parent == $term_id ) {
</span><span class="cx"> if ( $use_id )
</span><span class="lines">@@ -3524,7 +3534,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Determine if a post's cache for the passed taxonomy
</span><span class="cx"> * is in sync.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.9.0
</span><span class="cx"> *
</span><span class="cx"> * @param int $id
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/term/getTerms.php (27107 => 27108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/term/getTerms.php 2014-02-06 07:07:42 UTC (rev 27107)
+++ trunk/tests/phpunit/tests/term/getTerms.php 2014-02-06 17:44:50 UTC (rev 27108)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> class Tests_Term_getTerms extends WP_UnitTestCase {
</span><span class="cx"> function setUp() {
</span><span class="cx"> parent::setUp();
</span><del>-
</del><ins>+
</ins><span class="cx"> _clean_term_filters();
</span><span class="cx"> wp_cache_delete( 'last_changed', 'terms' );
</span><span class="cx"> }
</span><span class="lines">@@ -224,4 +224,53 @@
</span><span class="cx"> $terms8 = get_terms( 'post_tag', array( 'hide_empty' => false, 'description__like' => '.', 'fields' => 'ids' ) );
</span><span class="cx"> $this->assertEqualSets( array( $term_id1, $term_id2 ), $terms8 );
</span><span class="cx"> }
</span><ins>+
+ function test_get_terms_parent_zero() {
+ $tax = 'food';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $cheese = $this->factory->term->create( array( 'name' => 'Cheese', 'taxonomy' => $tax ) );
+
+ $cheddar = $this->factory->term->create( array( 'name' => 'Cheddar', 'parent' => $cheese, 'taxonomy' => $tax ) );
+
+ $post_ids = $this->factory->post->create_many( 2 );
+ foreach ( $post_ids as $id ) {
+ wp_set_post_terms( $id, $cheddar, $tax );
+ }
+ $term = get_term( $cheddar, $tax );
+ $this->assertEquals( 2, $term->count );
+
+ $brie = $this->factory->term->create( array( 'name' => 'Brie', 'parent' => $cheese, 'taxonomy' => $tax ) );
+ $post_ids = $this->factory->post->create_many( 7 );
+ foreach ( $post_ids as $id ) {
+ wp_set_post_terms( $id, $brie, $tax );
+ }
+ $term = get_term( $brie, $tax );
+ $this->assertEquals( 7, $term->count );
+
+ $crackers = $this->factory->term->create( array( 'name' => 'Crackers', 'taxonomy' => $tax ) );
+
+ $butter = $this->factory->term->create( array( 'name' => 'Butter', 'parent' => $crackers, 'taxonomy' => $tax ) );
+ $post_ids = $this->factory->post->create_many( 1 );
+ foreach ( $post_ids as $id ) {
+ wp_set_post_terms( $id, $butter, $tax );
+ }
+ $term = get_term( $butter, $tax );
+ $this->assertEquals( 1, $term->count );
+
+ $multigrain = $this->factory->term->create( array( 'name' => 'Multigrain', 'parent' => $crackers, 'taxonomy' => $tax ) );
+ $post_ids = $this->factory->post->create_many( 3 );
+ foreach ( $post_ids as $id ) {
+ wp_set_post_terms( $id, $multigrain, $tax );
+ }
+ $term = get_term( $multigrain, $tax );
+ $this->assertEquals( 3, $term->count );
+
+ $fruit = $this->factory->term->create( array( 'name' => 'Fruit', 'taxonomy' => $tax ) );
+ $cranberries = $this->factory->term->create( array( 'name' => 'Cranberries', 'parent' => $fruit, 'taxonomy' => $tax ) );
+
+ $terms = get_terms( $tax, array( 'parent' => 0, 'cache_domain' => $tax ) );
+ $this->assertNotEmpty( $terms );
+ $this->assertEquals( wp_list_pluck( $terms, 'name' ), array( 'Cheese', 'Crackers' ) );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>