<!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>[16056] trunk/wp-includes/taxonomy.php: Add terms_clauses filter.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16056">16056</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-28 17:55:30 +0000 (Thu, 28 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add terms_clauses filter. Props sc0ttkclark for initial patch. See <a href="http://trac.wordpress.org/ticket/15020">#15020</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (16055 => 16056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-10-28 17:29:44 UTC (rev 16055)
+++ trunk/wp-includes/taxonomy.php 2010-10-28 17:55:30 UTC (rev 16056)
</span><span class="lines">@@ -918,8 +918,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $in_taxonomies = "'" . implode("', '", $taxonomies) . "'";
-
</del><span class="cx"> $defaults = array('orderby' => 'name', 'order' => 'ASC',
</span><span class="cx"> 'hide_empty' => true, 'exclude' => array(), 'exclude_tree' => array(), 'include' => array(),
</span><span class="cx"> 'number' => '', 'fields' => 'all', 'slug' => '', 'parent' => '',
</span><span class="lines">@@ -941,6 +939,7 @@
</span><span class="cx"> $args['hierarchical'] = false;
</span><span class="cx"> $args['pad_counts'] = false;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> extract($args, EXTR_SKIP);
</span><span class="cx">
</span><span class="cx"> if ( $child_of ) {
</span><span class="lines">@@ -991,7 +990,7 @@
</span><span class="cx"> else
</span><span class="cx"> $order = '';
</span><span class="cx">
</span><del>- $where = '';
</del><ins>+ $where = "tt.taxonomy IN ('" . implode("', '", $taxonomies) . "')";
</ins><span class="cx"> $inclusions = '';
</span><span class="cx"> if ( !empty($include) ) {
</span><span class="cx"> $exclude = '';
</span><span class="lines">@@ -1058,11 +1057,11 @@
</span><span class="cx"> // don't limit the query results when we have to descend the family tree
</span><span class="cx"> if ( ! empty($number) && ! $hierarchical && empty( $child_of ) && '' === $parent ) {
</span><span class="cx"> if ( $offset )
</span><del>- $limit = 'LIMIT ' . $offset . ',' . $number;
</del><ins>+ $limits = 'LIMIT ' . $offset . ',' . $number;
</ins><span class="cx"> else
</span><del>- $limit = 'LIMIT ' . $number;
</del><ins>+ $limits = 'LIMIT ' . $number;
</ins><span class="cx"> } else {
</span><del>- $limit = '';
</del><ins>+ $limits = '';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($search) ) {
</span><span class="lines">@@ -1087,10 +1086,22 @@
</span><span class="cx"> $order = '';
</span><span class="cx"> $selects = array('COUNT(*)');
</span><span class="cx"> }
</span><del>- $select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
</del><span class="cx">
</span><del>- $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where $orderby $order $limit";
</del><ins>+ $_fields = $fields;
</ins><span class="cx">
</span><ins>+ $fields = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
+
+ $join = "INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id";
+
+ $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' );
+ $clauses = apply_filters( 'terms_clauses', compact( $pieces ), $taxonomies, $args );
+ foreach ( $pieces as $piece )
+ $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
+
+ $query = "SELECT $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
+
+ $fields = $_fields;
+
</ins><span class="cx"> if ( 'count' == $fields ) {
</span><span class="cx"> $term_count = $wpdb->get_var($query);
</span><span class="cx"> return $term_count;
</span></span></pre>
</div>
</div>
</body>
</html>