<!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>[16267] trunk/wp-includes: Make get_tax_sql() a standalone function.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16267">16267</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-09 23:30:35 +0000 (Tue, 09 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make get_tax_sql() a standalone function. See <a href="http://trac.wordpress.org/ticket/15032">#15032</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpobjectqueryphp">trunk/wp-includes/class-wp-object-query.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpobjectqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-object-query.php (16266 => 16267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-object-query.php 2010-11-09 23:22:13 UTC (rev 16266)
+++ trunk/wp-includes/class-wp-object-query.php 2010-11-09 23:30:35 UTC (rev 16267)
</span><span class="lines">@@ -72,61 +72,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><del>- * Used internally to generate an SQL string for searching across multiple taxonomies
- *
- * @access protected
- * @since 3.1.0
- *
- * @param array $tax_query List of taxonomy queries. A single taxonomy query is an associative array:
- * - 'taxonomy' string|array The taxonomy being queried
- * - 'terms' string|array The list of terms
- * - 'field' string (optional) Which term field is being used.
- * Possible values: 'term_id', 'slug' or 'name'
- * Default: 'slug'
- * - 'operator' string (optional)
- * Possible values: 'IN' and 'NOT IN'.
- * Default: 'IN'
- * - 'include_children' bool (optional) Whether to include child terms.
- * Default: true
- *
- * @param string $object_id_column
- * @return string
- */
- function get_tax_sql( $tax_query, $object_id_column ) {
- global $wpdb;
-
- $sql = array();
- foreach ( $tax_query as $query ) {
- if ( !isset( $query['include_children'] ) )
- $query['include_children'] = true;
-
- $query['do_query'] = false;
-
- $sql_single = get_objects_in_term( $query['terms'], $query['taxonomy'], $query );
-
- if ( empty( $sql_single ) )
- return ' AND 0 = 1';
-
- $sql[] = $sql_single;
- }
-
- if ( 1 == count( $sql ) ) {
- $ids = $wpdb->get_col( $sql[0] );
- } else {
- $r = "SELECT object_id FROM $wpdb->term_relationships WHERE 1=1";
- foreach ( $sql as $query )
- $r .= " AND object_id IN ($query)";
-
- $ids = $wpdb->get_col( $r );
- }
-
- if ( !empty( $ids ) )
- return " AND $object_id_column IN(" . implode( ', ', $ids ) . ")";
- else
- return ' AND 0 = 1';
- }
-
- /*
</del><span class="cx"> * Used internally to generate an SQL string for searching across multiple columns
</span><span class="cx"> *
</span><span class="cx"> * @access protected
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (16266 => 16267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-11-09 23:22:13 UTC (rev 16266)
+++ trunk/wp-includes/query.php 2010-11-09 23:30:35 UTC (rev 16267)
</span><span class="lines">@@ -1899,7 +1899,7 @@
</span><span class="cx"> $post_status_join = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $where .= $this->get_tax_sql( $q['tax_query'], "$wpdb->posts.ID" );
</del><ins>+ $where .= get_tax_sql( $q['tax_query'], "$wpdb->posts.ID" );
</ins><span class="cx">
</span><span class="cx"> // Back-compat
</span><span class="cx"> $cat_query = wp_list_filter( $q['tax_query'], array( 'taxonomy' => 'category' ) );
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (16266 => 16267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-11-09 23:22:13 UTC (rev 16266)
+++ trunk/wp-includes/taxonomy.php 2010-11-09 23:30:35 UTC (rev 16267)
</span><span class="lines">@@ -554,6 +554,61 @@
</span><span class="cx"> return $do_query ? $wpdb->get_col( $sql ) : $sql;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/*
+ * Given a meta query, generates SQL to be appended to a main query
+ *
+ * @since 3.1.0
+ *
+ * @param array $tax_query List of taxonomy queries. A single taxonomy query is an associative array:
+ * - 'taxonomy' string|array The taxonomy being queried
+ * - 'terms' string|array The list of terms
+ * - 'field' string (optional) Which term field is being used.
+ * Possible values: 'term_id', 'slug' or 'name'
+ * Default: 'slug'
+ * - 'operator' string (optional)
+ * Possible values: 'IN' and 'NOT IN'.
+ * Default: 'IN'
+ * - 'include_children' bool (optional) Whether to include child terms.
+ * Default: true
+ *
+ * @param string $object_id_column
+ * @return string
+ */
+function get_tax_sql( $tax_query, $object_id_column ) {
+ global $wpdb;
+
+ $sql = array();
+ foreach ( $tax_query as $query ) {
+ if ( !isset( $query['include_children'] ) )
+ $query['include_children'] = true;
+
+ $query['do_query'] = false;
+
+ $sql_single = get_objects_in_term( $query['terms'], $query['taxonomy'], $query );
+
+ if ( empty( $sql_single ) )
+ return ' AND 0 = 1';
+
+ $sql[] = $sql_single;
+ }
+
+ if ( 1 == count( $sql ) ) {
+ $ids = $wpdb->get_col( $sql[0] );
+ } else {
+ $r = "SELECT object_id FROM $wpdb->term_relationships WHERE 1=1";
+ foreach ( $sql as $query )
+ $r .= " AND object_id IN ($query)";
+
+ $ids = $wpdb->get_col( $r );
+ }
+
+ if ( !empty( $ids ) )
+ return " AND $object_id_column IN(" . implode( ', ', $ids ) . ")";
+ else
+ return ' AND 0 = 1';
+}
+
+
</ins><span class="cx"> /**
</span><span class="cx"> * Get all Term data from database by Term ID.
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>