<!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>[15734] trunk/wp-includes:
Prevent db error when dealing with unexistant parent term.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15734">15734</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-06 12:06:23 +0000 (Wed, 06 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent db error when dealing with unexistant parent term. See <a href="http://trac.wordpress.org/ticket/12891">#12891</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (15733 => 15734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-10-06 11:13:37 UTC (rev 15733)
+++ trunk/wp-includes/classes.php 2010-10-06 12:06:23 UTC (rev 15734)
</span><span class="lines">@@ -696,8 +696,15 @@
</span><span class="cx"> foreach ( $this->tax_query as $query ) {
</span><span class="cx"> if ( !isset( $query['include_children'] ) )
</span><span class="cx"> $query['include_children'] = true;
</span><ins>+
</ins><span class="cx"> $query['do_query'] = false;
</span><del>- $sql[] = get_objects_in_term( $query['terms'], $query['taxonomy'], $query );
</del><ins>+
+ $sql_single = get_objects_in_term( $query['terms'], $query['taxonomy'], $query );
+
+ if ( empty( $sql_single ) )
+ return ' AND 0 = 1';
+
+ $sql[] = $sql_single;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 1 == count( $sql ) ) {
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (15733 => 15734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-10-06 11:13:37 UTC (rev 15733)
+++ trunk/wp-includes/taxonomy.php 2010-10-06 12:06:23 UTC (rev 15734)
</span><span class="lines">@@ -466,16 +466,14 @@
</span><span class="cx"> return new WP_Error( 'invalid_taxonomy', sprintf( __( 'Invalid Taxonomy: %s' ), $taxonomy ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $terms = array_unique( (array) $terms );
- if ( empty($terms) )
- continue;
-
</del><span class="cx"> if ( !in_array( $field, array( 'term_id', 'slug', 'name' ) ) )
</span><span class="cx"> $field = 'term_id';
</span><span class="cx">
</span><span class="cx"> if ( !in_array( $operator, array( 'IN', 'NOT IN' ) ) )
</span><span class="cx"> $operator = 'IN';
</span><span class="cx">
</span><ins>+ $terms = array_unique( (array) $terms );
+
</ins><span class="cx"> if ( is_taxonomy_hierarchical( $taxonomy ) && $include_children ) {
</span><span class="cx"> $children = array();
</span><span class="cx"> foreach ( $terms as $term ) {
</span><span class="lines">@@ -492,6 +490,9 @@
</span><span class="cx"> $field = 'term_id';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( empty( $terms ) )
+ return $do_query ? array() : '';
+
</ins><span class="cx"> $taxonomies = "'" . implode( "', '", $taxonomies ) . "'";
</span><span class="cx">
</span><span class="cx"> switch ( $field ) {
</span><span class="lines">@@ -527,10 +528,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !$do_query )
- return $sql;
-
- return $wpdb->get_col( $sql );
</del><ins>+ return $do_query ? $wpdb->get_col( $sql ) : $sql;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>