<!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>[31285] trunk: Ensure that 'hierarchical' is respected in `get_terms()` when multiple taxonomies are 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" 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/31285">31285</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/31285","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-26 19:03:09 +0000 (Mon, 26 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'>Ensure that 'hierarchical' is respected in `get_terms()` when multiple taxonomies are passed.
Previously, attempts to descend the family tree of each term were done using
the first taxonomy in the `$taxonomies` array, with the result that terms not
belonging to that taxonomy were not found and their children not properly
parsed. We fix this bug by fetching each term's taxonomy with the SQL query,
and then using that taxonomy to get the correct children for each term.
Fixes <a href="https://core.trac.wordpress.org/ticket/31118">#31118</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-26 18:08:59 UTC (rev 31284)
+++ trunk/src/wp-includes/taxonomy.php 2015-01-26 19:03:09 UTC (rev 31285)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1887,10 +1887,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'ids':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'id=>parent':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $selects = array( 't.term_id', 'tt.parent', 'tt.count' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selects = array( 't.term_id', 'tt.parent', 'tt.count', 'tt.taxonomy' );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'names':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $selects = array( 't.term_id', 'tt.parent', 'tt.count', 't.name' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selects = array( 't.term_id', 'tt.parent', 'tt.count', 't.name', 'tt.taxonomy' );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'count':
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1898,10 +1898,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $selects = array( 'COUNT(*)' );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'id=>name':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $selects = array( 't.term_id', 't.name', 'tt.count' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selects = array( 't.term_id', 't.name', 'tt.count', 'tt.taxonomy' );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'id=>slug':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $selects = array( 't.term_id', 't.slug', 'tt.count' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selects = array( 't.term_id', 't.slug', 'tt.count', 'tt.taxonomy' );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1974,14 +1974,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _pad_term_counts( $terms, $_tax );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Make sure we show empty categories that have children.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $hierarchical && $args['hide_empty'] && is_array( $terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $k => $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $term->count ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $children = get_term_children( $term->term_id, reset( $taxonomies ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $children = get_term_children( $term->term_id, $term->taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $children ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $children as $child_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $child = get_term( $child_id, reset( $taxonomies ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $child = get_term( $child_id, $term->taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $child->count ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue 2;
</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-26 18:08:59 UTC (rev 31284)
+++ trunk/tests/phpunit/tests/term/getTerms.php 2015-01-26 19:03:09 UTC (rev 31285)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1070,6 +1070,48 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 31118
+ */
+ public function test_hierarchical_should_recurse_properly_for_all_taxonomies() {
+ register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => true ) );
+ register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );
+
+ $t1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+ $t2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1', 'parent' => $t1 ) );
+ $t3 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax1', 'parent' => $t2 ) );
+
+ $t4 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+ $t5 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t4 ) );
+ $t6 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t5 ) );
+
+ $p = $this->factory->post->create();
+
+ wp_set_object_terms( $p, $t3, 'wptests_tax1' );
+ wp_set_object_terms( $p, $t6, 'wptests_tax2' );
+
+ $found = get_terms( array( 'wptests_tax1', 'wptests_tax2' ), array(
+ 'hierarchical' => true,
+ 'hide_empty' => true,
+ 'fields' => 'ids',
+ ) );
+
+ /*
+ * Should contain all terms, since they all have non-empty descendants.
+ * To make the case clearer, test taxonomies separately.
+ */
+
+ // First taxonomy.
+ $this->assertContains( $t1, $found );
+ $this->assertContains( $t2, $found );
+ $this->assertContains( $t3, $found );
+
+ // Second taxonomy.
+ $this->assertContains( $t4, $found );
+ $this->assertContains( $t5, $found );
+ $this->assertContains( $t6, $found );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23261
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_include() {
</span></span></pre>
</div>
</div>
</body>
</html>