<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12658] trunk/wp-includes: Add support to get_terms() to allow 'include' &
'exclude' args to be arrays().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12658">12658</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-01-08 08:44:45 +0000 (Fri, 08 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support to get_terms() to allow 'include' & 'exclude' args to be arrays(). Fixes <a href="http://trac.wordpress.org/ticket/11076">#11076</a> props scribu.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (12657 => 12658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-01-08 08:34:39 UTC (rev 12657)
+++ trunk/wp-includes/functions.php 2010-01-08 08:44:45 UTC (rev 12658)
</span><span class="lines">@@ -2750,6 +2750,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Clean up an array, comma- or space-separated list of IDs
+ *
+ * @since 3.0.0
+ *
+ * @param array|string $list
+ * @return array Sanitized array of IDs
+ */
+function wp_parse_id_list($list) {
+ if ( !is_array($list) )
+ $list = preg_split('/[\s,]+/', $list);
+
+ return array_unique(array_map('absint', $list));
+}
+
+/**
</ins><span class="cx"> * Determines if default embed handlers should be loaded.
</span><span class="cx"> *
</span><span class="cx"> * Checks to make sure that the embeds library hasn't already been loaded. If
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (12657 => 12658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-01-08 08:34:39 UTC (rev 12657)
+++ trunk/wp-includes/taxonomy.php 2010-01-08 08:44:45 UTC (rev 12658)
</span><span class="lines">@@ -571,18 +571,19 @@
</span><span class="cx"> * hide_empty - Default is true. Will not return empty terms, which means
</span><span class="cx"> * terms whose count is 0 according to the given taxonomy.
</span><span class="cx"> *
</span><del>- * exclude - Default is an empty string. A comma- or space-delimited string
</del><ins>+ * exclude - Default is an empty array. An array, comma- or space-delimited string
</ins><span class="cx"> * of term ids to exclude from the return array. If 'include' is non-empty,
</span><span class="cx"> * 'exclude' is ignored.
</span><span class="cx"> *
</span><del>- * exclude_tree - A comma- or space-delimited string of term ids to exclude
- * from the return array, along with all of their descendant terms according to
- * the primary taxonomy. If 'include' is non-empty, 'exclude_tree' is ignored.
</del><ins>+ * exclude_tree - Default is an empty array. An array, comma- or space-delimited
+ * string of term ids to exclude from the return array, along with all of their
+ * descendant terms according to the primary taxonomy. If 'include' is non-empty,
+ * 'exclude_tree' is ignored.
</ins><span class="cx"> *
</span><del>- * include - Default is an empty string. A comma- or space-delimited string
</del><ins>+ * include - Default is an empty array. An array, comma- or space-delimited string
</ins><span class="cx"> * of term ids to include in the return array.
</span><span class="cx"> *
</span><del>- * number - The maximum number of terms to return. Default is empty.
</del><ins>+ * number - The maximum number of terms to return. Default is to return them all.
</ins><span class="cx"> *
</span><span class="cx"> * offset - The number by which to offset the terms query.
</span><span class="cx"> *
</span><span class="lines">@@ -651,7 +652,7 @@
</span><span class="cx"> $in_taxonomies = "'" . implode("', '", $taxonomies) . "'";
</span><span class="cx">
</span><span class="cx"> $defaults = array('orderby' => 'name', 'order' => 'ASC',
</span><del>- 'hide_empty' => true, 'exclude' => '', 'exclude_tree' => '', 'include' => '',
</del><ins>+ 'hide_empty' => true, 'exclude' => array(), 'exclude_tree' => array(), 'include' => array(),
</ins><span class="cx"> 'number' => '', 'fields' => 'all', 'slug' => '', 'parent' => '',
</span><span class="cx"> 'hierarchical' => true, 'child_of' => 0, 'get' => '', 'name__like' => '',
</span><span class="cx"> 'pad_counts' => false, 'offset' => '', 'search' => '');
</span><span class="lines">@@ -719,14 +720,12 @@
</span><span class="cx"> if ( !empty($include) ) {
</span><span class="cx"> $exclude = '';
</span><span class="cx"> $exclude_tree = '';
</span><del>- $interms = preg_split('/[\s,]+/',$include);
- if ( count($interms) ) {
- foreach ( (array) $interms as $interm ) {
- if (empty($inclusions))
- $inclusions = ' AND ( t.term_id = ' . intval($interm) . ' ';
- else
- $inclusions .= ' OR t.term_id = ' . intval($interm) . ' ';
- }
</del><ins>+ $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) . ' ';
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -735,29 +734,27 @@
</span><span class="cx"> $where .= $inclusions;
</span><span class="cx">
</span><span class="cx"> $exclusions = '';
</span><del>- if ( ! empty( $exclude_tree ) ) {
- $excluded_trunks = preg_split('/[\s,]+/',$exclude_tree);
- foreach( (array) $excluded_trunks as $extrunk ) {
</del><ins>+ if ( !empty( $exclude_tree ) ) {
+ $excluded_trunks = wp_parse_id_list($exclude_tree);
+ foreach ( $excluded_trunks as $extrunk ) {
</ins><span class="cx"> $excluded_children = (array) get_terms($taxonomies[0], array('child_of' => intval($extrunk), 'fields' => 'ids'));
</span><span class="cx"> $excluded_children[] = $extrunk;
</span><del>- foreach( (array) $excluded_children as $exterm ) {
</del><ins>+ foreach( $excluded_children as $exterm ) {
</ins><span class="cx"> if ( empty($exclusions) )
</span><span class="cx"> $exclusions = ' AND ( t.term_id <> ' . intval($exterm) . ' ';
</span><span class="cx"> else
</span><span class="cx"> $exclusions .= ' AND t.term_id <> ' . intval($exterm) . ' ';
</span><del>-
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if ( !empty($exclude) ) {
</span><del>- $exterms = preg_split('/[\s,]+/',$exclude);
- if ( count($exterms) ) {
- foreach ( (array) $exterms as $exterm ) {
- if ( empty($exclusions) )
- $exclusions = ' AND ( t.term_id <> ' . intval($exterm) . ' ';
- else
- $exclusions .= ' AND t.term_id <> ' . intval($exterm) . ' ';
- }
</del><ins>+ $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) . ' ';
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -834,7 +831,7 @@
</span><span class="cx"> foreach ( $terms as $k => $term ) {
</span><span class="cx"> if ( ! $term->count ) {
</span><span class="cx"> $children = _get_term_children($term->term_id, $terms, $taxonomies[0]);
</span><del>- if( is_array($children) )
</del><ins>+ if ( is_array($children) )
</ins><span class="cx"> foreach ( $children as $child )
</span><span class="cx"> if ( $child->count )
</span><span class="cx"> continue 2;
</span></span></pre>
</div>
</div>
</body>
</html>