<!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>[17251] trunk/wp-includes: Set tag_id for tag queries.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17251">17251</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-01-11 18:56:59 +0000 (Tue, 11 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set tag_id for tag queries. Add NOT support to wp_list_filter(). Props scribu. fixes <a href="http://trac.wordpress.org/ticket/16170">#16170</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.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 (17250 => 17251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2011-01-11 18:56:23 UTC (rev 17250)
+++ trunk/wp-includes/functions.php 2011-01-11 18:56:59 UTC (rev 17251)
</span><span class="lines">@@ -3049,21 +3049,26 @@
</span><span class="cx"> *
</span><span class="cx"> * @param array $list An array of objects to filter
</span><span class="cx"> * @param array $args An array of key => value arguments to match against each object
</span><del>- * @param string $operator The logical operation to perform. 'or' means only one element
- * from the array needs to match; 'and' means all elements must match. The default is 'and'.
</del><ins>+ * @param string $operator The logical operation to perform:
+ * 'AND' means all elements from the array must match;
+ * 'OR' means only one element needs to match;
+ * 'NOT' means no elements may match.
+ * The default is 'AND'.
</ins><span class="cx"> * @return array
</span><span class="cx"> */
</span><del>-function wp_list_filter( $list, $args = array(), $operator = 'and' ) {
</del><ins>+function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
</ins><span class="cx"> if ( empty( $args ) )
</span><span class="cx"> return $list;
</span><span class="cx">
</span><ins>+ $operator = strtoupper( $operator );
</ins><span class="cx"> $count = count( $args );
</span><del>-
</del><span class="cx"> $filtered = array();
</span><span class="cx">
</span><span class="cx"> foreach ( $list as $key => $obj ) {
</span><span class="cx"> $matched = count( array_intersect_assoc( (array) $obj, $args ) );
</span><del>- if ( ('and' == $operator && $matched == $count) || ('or' == $operator && $matched <= $count) ) {
</del><ins>+ if ( ( 'AND' == $operator && $matched == $count )
+ || ( 'OR' == $operator && $matched <= $count )
+ || ( 'NOT' == $operator && 0 == $matched ) ) {
</ins><span class="cx"> $filtered[$key] = $obj;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (17250 => 17251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2011-01-11 18:56:23 UTC (rev 17250)
+++ trunk/wp-includes/query.php 2011-01-11 18:56:59 UTC (rev 17251)
</span><span class="lines">@@ -2143,10 +2143,10 @@
</span><span class="cx">
</span><span class="cx"> // Back-compat
</span><span class="cx"> if ( !empty($this->tax_query->queries) ) {
</span><del>- $tax_query_in = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'IN' ) );
- if ( !empty( $tax_query_in ) ) {
</del><ins>+ $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );
+ if ( !empty( $tax_query_in_and ) ) {
</ins><span class="cx"> if ( !isset( $q['taxonomy'] ) ) {
</span><del>- foreach ( $tax_query_in as $a_tax_query ) {
</del><ins>+ foreach ( $tax_query_in_and as $a_tax_query ) {
</ins><span class="cx"> if ( !in_array( $a_tax_query['taxonomy'], array( 'category', 'post_tag' ) ) ) {
</span><span class="cx"> $q['taxonomy'] = $a_tax_query['taxonomy'];
</span><span class="cx"> if ( 'slug' == $a_tax_query['field'] )
</span><span class="lines">@@ -2159,15 +2159,28 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $cat_query = wp_list_filter( $tax_query_in, array( 'taxonomy' => 'category' ) );
</del><ins>+ $cat_query = wp_list_filter( $tax_query_in_and, array( 'taxonomy' => 'category' ) );
</ins><span class="cx"> if ( !empty( $cat_query ) ) {
</span><span class="cx"> $cat_query = reset( $cat_query );
</span><del>- $cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );
- if ( $cat ) {
- $this->set( 'cat', $cat->term_id );
- $this->set( 'category_name', $cat->slug );
</del><ins>+ $the_cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );
+ if ( $the_cat ) {
+ $this->set( 'cat', $the_cat->term_id );
+ $this->set( 'category_name', $the_cat->slug );
</ins><span class="cx"> }
</span><ins>+ unset( $the_cat );
</ins><span class="cx"> }
</span><ins>+ unset( $cat_query );
+
+ $tag_query = wp_list_filter( $tax_query_in_and, array( 'taxonomy' => 'post_tag' ) );
+ if ( !empty( $tag_query ) ) {
+ $tag_query = reset( $tag_query );
+ $the_tag = get_term_by( $tag_query['field'], $tag_query['terms'][0], 'post_tag' );
+ if ( $the_tag ) {
+ $this->set( 'tag_id', $the_tag->term_id );
+ }
+ unset( $the_tag );
+ }
+ unset( $tag_query );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2844,9 +2857,9 @@
</span><span class="cx"> $this->queried_object_id = 0;
</span><span class="cx">
</span><span class="cx"> if ( $this->is_category || $this->is_tag || $this->is_tax ) {
</span><del>- $tax_query_in = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'IN' ) );
</del><ins>+ $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );
</ins><span class="cx">
</span><del>- $query = reset( $tax_query_in );
</del><ins>+ $query = reset( $tax_query_in_and );
</ins><span class="cx">
</span><span class="cx"> if ( 'term_id' == $query['field'] )
</span><span class="cx"> $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
</span></span></pre>
</div>
</div>
</body>
</html>