<!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>[25162] trunk: Improve the include / exclude SQL generation in `get_terms()` by using `IN` and `NOT IN` where applicable.</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/25162">25162</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-08-29 16:23:30 +0000 (Thu, 29 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve the include / exclude SQL generation in `get_terms()` by using `IN` and `NOT IN` where applicable. Adds unit tests for include / exclude.
Props sirzooro, duck_.
Fixes <a href="http://core.trac.wordpress.org/ticket/11823">#11823</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkteststeststermgetTermsphp">trunk/tests/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 (25161 => 25162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/taxonomy.php 2013-08-29 15:18:08 UTC (rev 25161)
+++ trunk/src/wp-includes/taxonomy.php 2013-08-29 16:23:30 UTC (rev 25162)
</span><span class="lines">@@ -1301,50 +1301,41 @@
</span><span class="cx">
</span><span class="cx"> $where = "tt.taxonomy IN ('" . implode("', '", $taxonomies) . "')";
</span><span class="cx"> $inclusions = '';
</span><del>- if ( !empty($include) ) {
</del><ins>+ if ( ! empty( $include ) ) {
</ins><span class="cx"> $exclude = '';
</span><span class="cx"> $exclude_tree = '';
</span><del>- $interms = wp_parse_id_list($include);
- foreach ( $interms as $interm ) {
- if ( empty($inclusions) )
- $inclusions = ' AND ( t.term_id = ' . intval($interm) . ' ';
- else
- $inclusions .= ' OR t.term_id = ' . intval($interm) . ' ';
- }
</del><ins>+ $inclusions = implode( ',', array_map( 'intval', wp_parse_id_list( $include ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty($inclusions) )
- $inclusions .= ')';
</del><ins>+ if ( ! empty( $inclusions ) )
+ $inclusions = ' AND t.term_id IN ( ' . $inclusions . ' )';
</ins><span class="cx"> $where .= $inclusions;
</span><span class="cx">
</span><span class="cx"> $exclusions = '';
</span><span class="cx"> if ( ! empty( $exclude_tree ) ) {
</span><del>- $excluded_trunks = wp_parse_id_list( $exclude_tree );
- foreach ( $excluded_trunks as $extrunk ) {
- $excluded_children = (array) get_terms( reset( $taxonomies ), array( 'child_of' => intval( $extrunk ), 'fields' => 'ids', 'hide_empty' => 0 ) );
- $excluded_children[] = $extrunk;
- foreach( $excluded_children as $exterm ) {
- if ( empty( $exclusions ) )
- $exclusions = ' AND ( t.term_id <> ' . intval($exterm) . ' ';
- else
- $exclusions .= ' AND t.term_id <> ' . intval($exterm) . ' ';
- }
</del><ins>+ $exclude_tree = wp_parse_id_list( $exclude_tree );
+ $excluded_children = array();
+ foreach ( $exclude_tree as $extrunk ) {
+ $excluded_children = array_merge(
+ $excluded_children,
+ (array) get_terms( $taxonomies[0], array( 'child_of' => intval( $extrunk ), 'fields' => 'ids', 'hide_empty' => 0 ) )
+ );
</ins><span class="cx"> }
</span><ins>+ $exclusions = implode( ',', array_map( 'intval', $excluded_children ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty($exclude) ) {
- $exterms = wp_parse_id_list($exclude);
- foreach ( $exterms as $exterm ) {
- if ( empty($exclusions) )
- $exclusions = ' AND ( t.term_id <> ' . intval($exterm) . ' ';
- else
- $exclusions .= ' AND t.term_id <> ' . intval($exterm) . ' ';
- }
</del><ins>+ if ( ! empty( $exclude ) ) {
+ $exterms = array_map( 'intval', wp_parse_id_list( $exclude ) );
+ if ( empty( $exclusions ) )
+ $exclusions = implode( ',', $exterms );
+ else
+ $exclusions .= ', ' . implode( ',', $exterms );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty($exclusions) )
- $exclusions .= ')';
- $exclusions = apply_filters('list_terms_exclusions', $exclusions, $args );
</del><ins>+ if ( ! empty( $exclusions ) )
+ $exclusions = ' AND t.term_id NOT IN (' . $exclusions . ')';
+
+ $exclusions = apply_filters( 'list_terms_exclusions', $exclusions, $args );
</ins><span class="cx"> $where .= $exclusions;
</span><span class="cx">
</span><span class="cx"> if ( !empty($slug) ) {
</span></span></pre></div>
<a id="trunkteststeststermgetTermsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/tests/term/getTerms.php (25161 => 25162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/tests/term/getTerms.php 2013-08-29 15:18:08 UTC (rev 25161)
+++ trunk/tests/tests/term/getTerms.php 2013-08-29 16:23:30 UTC (rev 25162)
</span><span class="lines">@@ -119,4 +119,24 @@
</span><span class="cx"> $term_id2 => 'hoo'
</span><span class="cx"> ), $terms_id_slug );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @ti
+ * cket 11823
+ */
+ function test_get_terms_include_exclude() {
+ $term_id1 = $this->factory->tag->create();
+ $term_id2 = $this->factory->tag->create();
+ $inc_terms = get_terms( 'post_tag', array(
+ 'include' => array( $term_id1, $term_id2 ),
+ 'hide_empty' => false
+ ) );
+ $this->assertEquals( array( $term_id1, $term_id2 ), wp_list_pluck( $inc_terms, 'term_id' ) );
+
+ $exc_terms = get_terms( 'post_tag', array(
+ 'exclude' => array( $term_id1, $term_id2 ),
+ 'hide_empty' => false
+ ) );
+ $this->assertEquals( array(), wp_list_pluck( $exc_terms, 'term_id' ) );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>