<!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>[29845] trunk: In get_terms(), select term taxonomy count for all values of 'fields'.</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/29845">29845</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/29845","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>2014-10-06 22:04:11 +0000 (Mon, 06 Oct 2014)</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'>In get_terms(), select term taxonomy count for all values of 'fields'.
Not having the count caused queries with 'fields' values of 'id=>name' and
'id=>slug' to return incorrect results when querying a hierarchical taxonomy
with 'hide_empty=true'.
Includes unit tests for get_terms() when using various combinations of 'fields',
'hide_empty', and 'hierarchical' arguments.
Props technical_mastermind.
Fixes <a href="https://core.trac.wordpress.org/ticket/29859">#29859</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 2014-10-06 20:00:54 UTC (rev 29844)
+++ trunk/src/wp-includes/taxonomy.php 2014-10-06 22:04:11 UTC (rev 29845)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1512,10 +1512,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' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selects = array( 't.term_id', 't.name', 'tt.count' );
</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' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selects = array( 't.term_id', 't.slug', 'tt.count' );
</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></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 2014-10-06 20:00:54 UTC (rev 29844)
+++ trunk/tests/phpunit/tests/term/getTerms.php 2014-10-06 22:04:11 UTC (rev 29845)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,4 +351,435 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ public function test_get_terms_hierarchical_tax_hide_empty_false_fields_ids() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => false,
+ 'fields' => 'ids',
+ ) );
+
+ $expected = array(
+ $terms['parent1'],
+ $terms['parent2'],
+ $terms['child1'],
+ $terms['child2'],
+ $terms['grandchild1'],
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_true_fields_ids() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => true,
+ 'fields' => 'ids',
+ ) );
+
+ $expected = array(
+ $terms['parent1'],
+ $terms['parent2'],
+ $terms['child1'],
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_true_fields_ids_hierarchical_false() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => true,
+ 'fields' => 'ids',
+ 'hierarchical' => false,
+ ) );
+
+ $expected = array(
+ $terms['parent2'],
+ $terms['child1'],
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_false_fields_names() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => false,
+ 'fields' => 'names',
+ ) );
+
+ $expected = array(
+ 'Parent 1',
+ 'Parent 2',
+ 'Child 1',
+ 'Child 2',
+ 'Grandchild 1',
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_true_fields_names() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => true,
+ 'fields' => 'names',
+ ) );
+
+ $expected = array(
+ 'Parent 1',
+ 'Parent 2',
+ 'Child 1',
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_true_fields_names_hierarchical_false() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => true,
+ 'fields' => 'names',
+ 'hierarchical' => false,
+ ) );
+
+ $expected = array(
+ 'Parent 2',
+ 'Child 1',
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_false_fields_count() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => false,
+ 'fields' => 'count',
+ ) );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEquals( 5, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_true_fields_count() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => true,
+ 'fields' => 'count',
+ ) );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ // When using 'fields=count', 'hierarchical' is forced to false.
+ $this->assertEquals( 2, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_true_fields_count_hierarchical_false() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => true,
+ 'fields' => 'count',
+ 'hierarchical' => false,
+ ) );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEquals( 2, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_false_fields_idparent() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => false,
+ 'fields' => 'id=>parent',
+ ) );
+
+ $expected = array(
+ $terms['parent1'] => 0,
+ $terms['parent2'] => 0,
+ $terms['child1'] => $terms['parent1'],
+ $terms['child2'] => $terms['parent1'],
+ $terms['grandchild1'] => $terms['child1'],
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_true_fields_idparent() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => true,
+ 'fields' => 'id=>parent',
+ ) );
+
+ $expected = array(
+ $terms['parent1'] => 0,
+ $terms['parent2'] => 0,
+ $terms['child1'] => $terms['parent1'],
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_true_fields_idparent_hierarchical_false() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => true,
+ 'fields' => 'id=>parent',
+ 'hierarchical' => false,
+ ) );
+
+ $expected = array(
+ $terms['parent2'] => 0,
+ $terms['child2'] => $terms['parent1'],
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_false_fields_idslug() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => false,
+ 'fields' => 'id=>slug',
+ ) );
+
+ $expected = array(
+ $terms['parent1'] => 'parent-1',
+ $terms['parent2'] => 'parent-2',
+ $terms['child1'] => 'child-1',
+ $terms['child2'] => 'child-2',
+ $terms['grandchild1'] => 'grandchild-1',
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ /**
+ * @ticket 29859
+ */
+ public function test_get_terms_hierarchical_tax_hide_empty_true_fields_idslug() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => true,
+ 'fields' => 'id=>slug',
+ ) );
+
+ $expected = array(
+ $terms['parent1'] => 'parent-1',
+ $terms['parent2'] => 'parent-2',
+ $terms['child1'] => 'child-1',
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_true_fields_idslug_hierarchical_false() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => true,
+ 'fields' => 'id=>slug',
+ 'hierarchical' => false,
+ ) );
+
+ $expected = array(
+ $terms['parent2'] => 'parent-2',
+ $terms['child1'] => 'child-1',
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_false_fields_idname() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => false,
+ 'fields' => 'id=>name',
+ ) );
+
+ $expected = array(
+ $terms['parent1'] => 'Parent 1',
+ $terms['parent2'] => 'Parent 2',
+ $terms['child1'] => 'Child 1',
+ $terms['child2'] => 'Child 2',
+ $terms['grandchild1'] => 'Grandchild 1',
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ /**
+ * @ticket 29859
+ */
+ public function test_get_terms_hierarchical_tax_hide_empty_true_fields_idname() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => true,
+ 'fields' => 'id=>name',
+ ) );
+
+ $expected = array(
+ $terms['parent1'] => 'Parent 1',
+ $terms['parent2'] => 'Parent 2',
+ $terms['child1'] => 'Child 1',
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ public function test_get_terms_hierarchical_tax_hide_empty_true_fields_idname_hierarchical_false() {
+ // Set up a clean taxonomy.
+ $tax = 'hierarchical_fields';
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ $terms = $this->create_hierarchical_terms_and_posts();
+
+ $found = get_terms( $tax, array(
+ 'hide_empty' => true,
+ 'fields' => 'id=>name',
+ 'hierarchical' => false,
+ ) );
+
+ $expected = array(
+ $terms['parent2'] => 'Parent 2',
+ $terms['child1'] => 'Child 1',
+ );
+
+ _unregister_taxonomy( 'hierarchical_fields' );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ protected function create_hierarchical_terms_and_posts() {
+
+ $terms = array();
+
+ $terms['parent1'] = $this->factory->term->create( array( 'slug' => 'parent-1', 'name' => 'Parent 1', 'taxonomy' => 'hierarchical_fields' ) );
+ $terms['parent2'] = $this->factory->term->create( array( 'slug' => 'parent-2', 'name' => 'Parent 2', 'taxonomy' => 'hierarchical_fields' ) );
+ $terms['child1'] = $this->factory->term->create( array( 'slug' => 'child-1', 'name' => 'Child 1', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['parent1'] ) );
+ $terms['child2'] = $this->factory->term->create( array( 'slug' => 'child-2', 'name' => 'Child 2', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['parent1'] ) );
+ $terms['grandchild1'] = $this->factory->term->create( array( 'slug' => 'grandchild-1', 'name' => 'Grandchild 1', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['child1'] ) );
+
+ $post_id = $this->factory->post->create();
+ wp_set_post_terms( $post_id, $terms['parent2'], 'hierarchical_fields', true );
+ wp_set_post_terms( $post_id, $terms['child1'], 'hierarchical_fields', true );
+
+ return $terms;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>