<!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>[16845] trunk/wp-includes/taxonomy.php: False advertising is bad.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16845">16845</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-12-09 17:19:23 +0000 (Thu, 09 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>False advertising is bad. See <a href="http://trac.wordpress.org/ticket/15752">#15752</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 (16844 => 16845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-12-09 17:09:42 UTC (rev 16844)
+++ trunk/wp-includes/taxonomy.php 2010-12-09 17:19:23 UTC (rev 16845)
</span><span class="lines">@@ -511,7 +511,7 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param array $tax_query List of taxonomy queries. A single taxonomy query is an associative array:
</span><del>- * - 'taxonomy' string|array The taxonomy being queried
</del><ins>+ * - 'taxonomy' string The taxonomy being queried
</ins><span class="cx"> * - 'terms' string|array The list of terms
</span><span class="cx"> * - 'field' string (optional) Which term field is being used.
</span><span class="cx"> * Possible values: 'term_id', 'slug' or 'name'
</span><span class="lines">@@ -547,22 +547,16 @@
</span><span class="cx">
</span><span class="cx"> extract( $query );
</span><span class="cx">
</span><del>- $taxonomies = (array) $taxonomy;
</del><ins>+ if ( ! taxonomy_exists( $taxonomy ) )
+ return array( 'join' => '', 'where' => ' AND 0 = 1');
</ins><span class="cx">
</span><del>- foreach ( $taxonomies as $taxonomy ) {
- if ( ! taxonomy_exists( $taxonomy ) )
- return array( 'join' => '', 'where' => ' AND 0 = 1');
- }
-
- $taxonomies = "'" . implode( "', '", $taxonomies ) . "'";
-
</del><span class="cx"> $terms = array_unique( (array) $terms );
</span><span class="cx">
</span><span class="cx"> if ( empty( $terms ) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if ( is_taxonomy_hierarchical( $taxonomy ) && $include_children ) {
</span><del>- _transform_terms( $terms, $taxonomies, $field, 'term_id' );
</del><ins>+ _transform_terms( $terms, $taxonomy, $field, 'term_id' );
</ins><span class="cx">
</span><span class="cx"> $children = array();
</span><span class="cx"> foreach ( $terms as $term ) {
</span><span class="lines">@@ -571,10 +565,10 @@
</span><span class="cx"> }
</span><span class="cx"> $terms = $children;
</span><span class="cx">
</span><del>- _transform_terms( $terms, $taxonomies, 'term_id', 'term_taxonomy_id' );
</del><ins>+ _transform_terms( $terms, $taxonomy, 'term_id', 'term_taxonomy_id' );
</ins><span class="cx"> }
</span><span class="cx"> else {
</span><del>- _transform_terms( $terms, $taxonomies, $field, 'term_taxonomy_id' );
</del><ins>+ _transform_terms( $terms, $taxonomy, $field, 'term_taxonomy_id' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 'IN' == $operator ) {
</span><span class="lines">@@ -626,7 +620,7 @@
</span><span class="cx"> $tax_query['relation'] = 'AND';
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'taxonomy' => array(),
</del><ins>+ 'taxonomy' => '',
</ins><span class="cx"> 'terms' => array(),
</span><span class="cx"> 'include_children' => true,
</span><span class="cx"> 'field' => 'term_id',
</span><span class="lines">@@ -643,7 +637,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function _transform_terms( &$terms, $taxonomies, $field, $resulting_field ) {
</del><ins>+function _transform_terms( &$terms, $taxonomy, $field, $resulting_field ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( empty( $terms ) )
</span><span class="lines">@@ -662,7 +656,7 @@
</span><span class="cx"> SELECT $wpdb->term_taxonomy.$resulting_field
</span><span class="cx"> FROM $wpdb->term_taxonomy
</span><span class="cx"> INNER JOIN $wpdb->terms USING (term_id)
</span><del>- WHERE taxonomy IN ($taxonomies)
</del><ins>+ WHERE taxonomy = '$taxonomy'
</ins><span class="cx"> AND $wpdb->terms.$field IN ($terms)
</span><span class="cx"> " );
</span><span class="cx"> break;
</span><span class="lines">@@ -672,7 +666,7 @@
</span><span class="cx"> $terms = $wpdb->get_col( "
</span><span class="cx"> SELECT $resulting_field
</span><span class="cx"> FROM $wpdb->term_taxonomy
</span><del>- WHERE taxonomy IN ($taxonomies)
</del><ins>+ WHERE taxonomy = '$taxonomy'
</ins><span class="cx"> AND term_id IN ($terms)
</span><span class="cx"> " );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>