<!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>[15714] trunk/wp-includes: Strip redundant 'meta_' from 'meta_query' keys.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15714">15714</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-04 18:26:26 +0000 (Mon, 04 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Strip redundant 'meta_' from 'meta_query' keys. See <a href="http://trac.wordpress.org/ticket/14645">#14645</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>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.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 (15713 => 15714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php        2010-10-04 17:51:17 UTC (rev 15713)
+++ trunk/wp-includes/functions.php        2010-10-04 18:26:26 UTC (rev 15714)
</span><span class="lines">@@ -4278,9 +4278,9 @@
</span><span class="cx">         $where = '';
</span><span class="cx">         $i = 0;
</span><span class="cx">         foreach ( $queries as $q ) {
</span><del>-                $meta_key = isset( $q['meta_key'] ) ? trim( $q['meta_key'] ) : '';
-                $meta_value = isset( $q['meta_value'] ) ? trim( $q['meta_value'] ) : '';
-                $meta_compare = isset( $q['meta_compare'] ) ? $q['meta_compare'] : '=';
</del><ins>+                $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
+                $meta_value = isset( $q['value'] ) ? trim( $q['value'] ) : '';
+                $meta_compare = isset( $q['compare'] ) ? $q['compare'] : '=';
</ins><span class="cx"> 
</span><span class="cx">                 if ( !in_array( $meta_compare, array( '=', '!=', '&gt;', '&gt;=', '&lt;', '&lt;=', 'like' ) ) )
</span><span class="cx">                         $meta_compare = '=';
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15713 => 15714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php        2010-10-04 17:51:17 UTC (rev 15713)
+++ trunk/wp-includes/query.php        2010-10-04 18:26:26 UTC (rev 15714)
</span><span class="lines">@@ -1393,10 +1393,15 @@
</span><span class="cx">                                 $this-&gt;meta_query = $qv['meta_query'];
</span><span class="cx">                         }
</span><span class="cx"> 
</span><del>-                        $meta_query = wp_array_slice_assoc( $qv, array( 'meta_key', 'meta_value', 'meta_compare' ) );
</del><ins>+                        $meta_query = array();
+                        foreach ( array( 'key', 'value', 'compare' ) as $key ) {
+                                if ( !empty( $qv[ &quot;meta_$key&quot; ] ) )
+                                        $meta_query[ $key ] = $qv[ &quot;meta_$key&quot; ];
+                        }
</ins><span class="cx"> 
</span><del>-                        if ( !empty( $meta_query ) )
</del><ins>+                        if ( !empty( $meta_query ) ) {
</ins><span class="cx">                                 $this-&gt;meta_query[] = $meta_query;
</span><ins>+                        }
</ins><span class="cx"> 
</span><span class="cx">                         if ( empty($qv['author']) || ($qv['author'] == '0') ) {
</span><span class="cx">                                 $this-&gt;is_author = false;
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (15713 => 15714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php        2010-10-04 17:51:17 UTC (rev 15713)
+++ trunk/wp-includes/user.php        2010-10-04 18:26:26 UTC (rev 15714)
</span><span class="lines">@@ -451,18 +451,26 @@
</span><span class="cx"> 
</span><span class="cx">                 if ( $blog_id ) {
</span><span class="cx">                         $cap_meta_query = array();
</span><del>-                        $cap_meta_query['meta_key'] = $wpdb-&gt;get_blog_prefix( $blog_id ) . 'capabilities';
</del><ins>+                        $cap_meta_query['key'] = $wpdb-&gt;get_blog_prefix( $blog_id ) . 'capabilities';
</ins><span class="cx"> 
</span><span class="cx">                         if ( $role ) {
</span><del>-                                $cap_meta_query['meta_value'] = $role;
-                                $cap_meta_query['meta_compare'] = 'like';
</del><ins>+                                $cap_meta_query['value'] = $role;
+                                $cap_meta_query['compare'] = 'like';
</ins><span class="cx">                         }
</span><span class="cx"> 
</span><span class="cx">                         $meta_queries[] = $cap_meta_query;
</span><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                $meta_queries[] = wp_array_slice_assoc( $qv, array( 'meta_key', 'meta_value', 'meta_compare' ) );
</del><ins>+                $meta_query = array();
+                foreach ( array( 'key', 'value', 'compare' ) as $key ) {
+                        if ( !empty( $qv[ &quot;meta_$key&quot; ] ) )
+                                $meta_query[ $key ] = $qv[ &quot;meta_$key&quot; ];
+                }
</ins><span class="cx"> 
</span><ins>+                if ( !empty( $meta_query ) ) {
+                        $meta_queries[] = $meta_query;
+                }
+
</ins><span class="cx">                 list( $meta_join, $meta_where ) = _wp_meta_sql( $meta_queries, $wpdb-&gt;users, 'ID', $wpdb-&gt;usermeta, 'user_id' );
</span><span class="cx">                 $this-&gt;query_from .= $meta_join;
</span><span class="cx">                 $this-&gt;query_where .= $meta_where;
</span></span></pre>
</div>
</div>

</body>
</html>