<!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>[37683] trunk: Introduce `term_taxonomy_id` parameter for `WP_Term_Query`.</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/37683">37683</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/37683","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>2016-06-11 03:48:03 +0000 (Sat, 11 Jun 2016)</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'>Introduce `term_taxonomy_id` parameter for `WP_Term_Query`.
Allows the fetching of terms based on `term_taxonomy_id`, or an array of
`term_taxonomy_ids`.
Props spacedmonkey.
Fixes <a href="https://core.trac.wordpress.org/ticket/37074">#37074</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswptermqueryphp">trunk/src/wp-includes/class-wp-term-query.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunitteststermqueryphp">trunk/tests/phpunit/tests/term/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswptermqueryphp"></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/class-wp-term-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-term-query.php 2016-06-11 03:26:07 UTC (rev 37682)
+++ trunk/src/wp-includes/class-wp-term-query.php 2016-06-11 03:48:03 UTC (rev 37683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,6 +92,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Sets up the term query, based on the query vars passed.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.6.0 Introduced 'term_taxonomy_id' parameter.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $query {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,6 +137,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string|array $slug Optional. Slug or array of slugs to return term(s) for.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default empty.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type int|array $term_taxonomy_id Optional. Term taxonomy ID, or array of term taxonomy IDs,
+ * to match when querying terms.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type bool $hierarchical Whether to include terms that have non-empty descendants (even
</span><span class="cx" style="display: block; padding: 0 10px"> * if $hide_empty is set to true). Default true.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $search Search criteria to match terms. Will be SQL-formatted with
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,6 +186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'count' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'term_taxonomy_id' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'search' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,6 +477,15 @@
</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">+ if ( ! empty( $args['term_taxonomy_id'] ) ) {
+ if ( is_array( $args['term_taxonomy_id'] ) ) {
+ $tt_ids = implode( ',', array_map( 'intval', $args['term_taxonomy_id'] ) );
+ $this->sql_clauses['where']['term_taxonomy_id'] = "tt.term_taxonomy_id IN ({$tt_ids})";
+ } else {
+ $this->sql_clauses['where']['term_taxonomy_id'] = $wpdb->prepare( "tt.term_taxonomy_id = %d", $args['term_taxonomy_id'] );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['name__like'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['where']['name__like'] = $wpdb->prepare( "t.name LIKE %s", '%' . $wpdb->esc_like( $args['name__like'] ) . '%' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststermqueryphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/term/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/query.php (rev 0)
+++ trunk/tests/phpunit/tests/term/query.php 2016-06-11 03:48:03 UTC (rev 37683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,64 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group taxonomy
+ */
+class Tests_Term_Query extends WP_UnitTestCase {
+ /**
+ * @ticket 37074
+ */
+ public function test_term_taxonomy_id_single() {
+ global $wpdb;
+
+ register_taxonomy( 'wptests_tax', 'post' );
+
+ $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+
+ // Manually change the term_taxonomy_id to something else.
+ $wpdb->update(
+ $wpdb->term_taxonomy,
+ array( 'term_taxonomy_id' => 12345 ),
+ array( 'term_id' => $terms[0] )
+ );
+
+ $q = new WP_Term_Query( array(
+ 'term_taxonomy_id' => 12345,
+ 'fields' => 'ids',
+ 'hide_empty' => false,
+ ) );
+
+ $this->assertEqualSets( array( $terms[0] ), $q->terms );
+ }
+
+ /**
+ * @ticket 37074
+ */
+ public function test_term_taxonomy_id_array() {
+ global $wpdb;
+
+ register_taxonomy( 'wptests_tax', 'post' );
+
+ $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+
+ // Manually change the term_taxonomy_id to something else.
+ $wpdb->update(
+ $wpdb->term_taxonomy,
+ array( 'term_taxonomy_id' => 12345 ),
+ array( 'term_id' => $terms[0] )
+ );
+
+ $wpdb->update(
+ $wpdb->term_taxonomy,
+ array( 'term_taxonomy_id' => 6789 ),
+ array( 'term_id' => $terms[2] )
+ );
+
+ $q = new WP_Term_Query( array(
+ 'term_taxonomy_id' => array( 12345, 6789 ),
+ 'fields' => 'ids',
+ 'hide_empty' => false,
+ ) );
+
+ $this->assertEqualSets( array( $terms[0], $terms[2] ), $q->terms );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>