<!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>[17674] trunk/wp-includes: Allow querying empty meta values.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17674">17674</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-04-21 18:13:03 +0000 (Thu, 21 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow querying empty meta values. Props scribu. fixes <a href="http://trac.wordpress.org/ticket/15292">#15292</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.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 (17673 => 17674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2011-04-21 16:48:12 UTC (rev 17673)
+++ trunk/wp-includes/meta.php 2011-04-21 18:13:03 UTC (rev 17674)
</span><span class="lines">@@ -387,7 +387,6 @@
</span><span class="cx"> $i = 0;
</span><span class="cx"> foreach ( $meta_query as $q ) {
</span><span class="cx"> $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
</span><del>- $meta_value = isset( $q['value'] ) ? $q['value'] : '';
</del><span class="cx"> $meta_compare = isset( $q['compare'] ) ? strtoupper( $q['compare'] ) : '=';
</span><span class="cx"> $meta_type = isset( $q['type'] ) ? strtoupper( $q['type'] ) : 'CHAR';
</span><span class="cx">
</span><span class="lines">@@ -413,16 +412,20 @@
</span><span class="cx"> if ( !empty( $meta_key ) )
</span><span class="cx"> $where .= $wpdb->prepare( " AND $alias.meta_key = %s", $meta_key );
</span><span class="cx">
</span><ins>+ if ( !isset( $q['value'] ) )
+ continue;
+ $meta_value = $q['value'];
+
</ins><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><ins>+
+ if ( empty( $meta_value ) )
+ continue;
</ins><span class="cx"> } else {
</span><span class="cx"> $meta_value = trim( $meta_value );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( empty( $meta_value ) )
- continue;
-
</del><span class="cx"> if ( 'IN' == substr( $meta_compare, -2) ) {
</span><span class="cx"> $meta_compare_string = '(' . substr( str_repeat( ',%s', count( $meta_value ) ), 1 ) . ')';
</span><span class="cx"> } elseif ( 'BETWEEN' == substr( $meta_compare, -7) ) {
</span><span class="lines">@@ -435,10 +438,6 @@
</span><span class="cx"> $meta_compare_string = '%s';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // @todo Temporary hack to support empty values. Do not use outside of core.
- if ( '_wp_zero_value' == $meta_value )
- $meta_value = 0;
-
</del><span class="cx"> $where .= $wpdb->prepare( " AND CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$meta_compare_string}", $meta_value );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -457,11 +456,15 @@
</span><span class="cx"> $meta_query = array();
</span><span class="cx">
</span><span class="cx"> // Simple query needs to be first for orderby=meta_value to work correctly
</span><del>- foreach ( array( 'key', 'value', 'compare', 'type' ) as $key ) {
</del><ins>+ foreach ( array( 'key', 'compare', 'type' ) as $key ) {
</ins><span class="cx"> if ( !empty( $qv[ "meta_$key" ] ) )
</span><span class="cx"> $meta_query[0][ $key ] = $qv[ "meta_$key" ];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // WP_Query sets 'meta_value' = '' by default
+ if ( isset( $qv[ 'meta_value' ] ) && '' !== $qv[ 'meta_value' ] )
+ $meta_query[0]['value'] = $qv[ 'meta_value' ];
+
</ins><span class="cx"> if ( !empty( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ) {
</span><span class="cx"> $meta_query = array_merge( $meta_query, $qv['meta_query'] );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (17673 => 17674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2011-04-21 16:48:12 UTC (rev 17673)
+++ trunk/wp-includes/user.php 2011-04-21 18:13:03 UTC (rev 17674)
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 'authors' == $qv['who'] && $blog_id ) {
</span><span class="cx"> $qv['meta_key'] = $wpdb->get_blog_prefix( $blog_id ) . 'user_level';
</span><del>- $qv['meta_value'] = '_wp_zero_value'; // Hack to pass '0'
</del><ins>+ $qv['meta_value'] = 0;
</ins><span class="cx"> $qv['meta_compare'] = '!=';
</span><span class="cx"> $qv['blog_id'] = $blog_id = 0; // Prevent extra meta query
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>