<!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>[17746] trunk/wp-includes/meta.php:
Properly handle querying for meta by value without a key as well as those with invalid parameters
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17746">17746</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2011-04-28 15:02:16 +0000 (Thu, 28 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Properly handle querying for meta by value without a key as well as those with invalid parameters. Props scribu. See <a href="http://trac.wordpress.org/ticket/17264">#17264</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/meta.php (17745 => 17746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2011-04-28 12:47:36 UTC (rev 17745)
+++ trunk/wp-includes/meta.php 2011-04-28 15:02:16 UTC (rev 17746)
</span><span class="lines">@@ -476,9 +476,9 @@
</span><span class="cx">
</span><span class="cx"> $meta_id_column = esc_sql( $type . '_id' );
</span><span class="cx">
</span><del>- $join = '';
</del><ins>+ $join = array();
</ins><span class="cx"> $where = array();
</span><del>- $i = 0;
</del><ins>+
</ins><span class="cx"> foreach ( $this->queries as $k => $q ) {
</span><span class="cx"> $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
</span><span class="cx"> $meta_compare = isset( $q['compare'] ) ? strtoupper( $q['compare'] ) : '=';
</span><span class="lines">@@ -492,30 +492,34 @@
</span><span class="cx"> elseif ( ! in_array( $meta_type, array( 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED' ) ) )
</span><span class="cx"> $meta_type = 'CHAR';
</span><span class="cx">
</span><del>- if ( empty( $meta_key ) && empty( $meta_value ) )
- continue;
-
</del><ins>+ $i = count( $join );
</ins><span class="cx"> $alias = $i ? 'mt' . $i : $meta_table;
</span><span class="cx">
</span><del>- $join .= "\nINNER JOIN $meta_table";
- $join .= $i ? " AS $alias" : '';
- $join .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)";
</del><ins>+ // Set JOIN
+ $join[$i] = "INNER JOIN $meta_table";
+ $join[$i] .= $i ? " AS $alias" : '';
+ $join[$i] .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)";
</ins><span class="cx">
</span><del>- $i++;
-
</del><ins>+ $where[$k] = '';
</ins><span class="cx"> if ( !empty( $meta_key ) )
</span><span class="cx"> $where[$k] = $wpdb->prepare( "$alias.meta_key = %s", $meta_key );
</span><span class="cx">
</span><del>- if ( !isset( $q['value'] ) )
</del><ins>+ if ( !isset( $q['value'] ) ) {
+ if ( empty( $where[$k] ) )
+ unset( $join[$i] );
</ins><span class="cx"> continue;
</span><ins>+ }
+
</ins><span class="cx"> $meta_value = $q['value'];
</span><span class="cx">
</span><span class="cx"> if ( in_array( $meta_compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
</span><span class="cx"> if ( ! is_array( $meta_value ) )
</span><span class="cx"> $meta_value = preg_split( '/[,\s]+/', $meta_value );
</span><span class="cx">
</span><del>- if ( empty( $meta_value ) )
</del><ins>+ if ( empty( $meta_value ) ) {
+ unset( $join[$i] );
</ins><span class="cx"> continue;
</span><ins>+ }
</ins><span class="cx"> } else {
</span><span class="cx"> $meta_value = trim( $meta_value );
</span><span class="cx"> }
</span><span class="lines">@@ -532,13 +536,25 @@
</span><span class="cx"> $meta_compare_string = '%s';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $where[$k] = ' (' . $where[$k] . $wpdb->prepare( " AND CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$meta_compare_string})", $meta_value );
</del><ins>+ if ( ! empty( $where[$k] ) )
+ $where[$k] .= ' AND ';
+
+ $where[$k] = ' (' . $where[$k] . $wpdb->prepare( "CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$meta_compare_string})", $meta_value );
</ins><span class="cx"> }
</span><del>- $where = ' AND (' . implode( " {$this->relation} ", $where ) . ' )';
</del><span class="cx">
</span><ins>+ $where = array_filter( $where );
+
+ if ( empty( $where ) )
+ $where = '';
+ else
+ $where = ' AND (' . implode( "\n{$this->relation} ", $where ) . ' )';
+
+ $join = implode( "\n", $join );
+ if ( ! empty( $join ) )
+ $join = ' ' . $join;
+
</ins><span class="cx"> return apply_filters_ref_array( 'get_meta_sql', array( compact( 'join', 'where' ), $this->queries, $type, $primary_table, $primary_id_column, $context ) );
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>