<!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>[15766] trunk/wp-includes: Get rid of redundant $this-&gt;meta_query.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15766">15766</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-09 10:48:13 +0000 (Sat, 09 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Get rid of redundant $this-&gt;meta_query. See <a href="http://trac.wordpress.org/ticket/14645">#14645</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.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="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (15765 => 15766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php        2010-10-09 10:19:15 UTC (rev 15765)
+++ trunk/wp-includes/classes.php        2010-10-09 10:48:13 UTC (rev 15766)
</span><span class="lines">@@ -544,25 +544,6 @@
</span><span class="cx">  */
</span><span class="cx"> class WP_Object_Query {
</span><span class="cx"> 
</span><del>-        /**
-         * List of metadata queries
-         *
-         * A query is an associative array:
-         * - 'key' string The meta key
-         * - 'value' string|array The meta value
-         * - 'compare' (optional) string How to compare the key to the value.
-         *                Possible values: '=', '!=', '&gt;', '&gt;=', '&lt;', '&lt;=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'.
-         *                Default: '='
-         * - 'type' string (optional) The type of the value.
-         *                Possible values: 'NUMERIC', 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED'.
-         *                Default: 'CHAR'
-         *
-         * @since 3.1.0
-         * @access public
-         * @var array
-         */
-        var $meta_query = array();
-
</del><span class="cx">         /*
</span><span class="cx">          * Populates the $meta_query property
</span><span class="cx">          *
</span><span class="lines">@@ -571,20 +552,20 @@
</span><span class="cx">          *
</span><span class="cx">          * @param array $qv The query variables
</span><span class="cx">          */
</span><del>-        function parse_meta_query( $qv ) {
-                if ( ! empty( $qv['meta_query'] ) &amp;&amp; is_array( $qv['meta_query'] ) ) {
-                        $this-&gt;meta_query = $qv['meta_query'];
-                }
-
</del><ins>+        function parse_meta_query( &amp;$qv ) {
</ins><span class="cx">                 $meta_query = array();
</span><ins>+
+                // Simple query needs to be first for orderby=meta_value to work correctly
</ins><span class="cx">                 foreach ( array( 'key', 'value', 'compare', 'type' ) as $key ) {
</span><del>-                        if ( ! empty( $qv[ &quot;meta_$key&quot; ] ) )
-                                $meta_query[ $key ] = $qv[ &quot;meta_$key&quot; ];
</del><ins>+                        if ( !empty( $qv[ &quot;meta_$key&quot; ] ) )
+                                $meta_query[0][ $key ] = $qv[ &quot;meta_$key&quot; ];
</ins><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                if ( ! empty( $meta_query ) ) {
-                        array_unshift( $this-&gt;meta_query, $meta_query );
</del><ins>+                if ( !empty( $qv['meta_query'] ) &amp;&amp; is_array( $qv['meta_query'] ) ) {
+                        $meta_query = array_merge( $meta_query, $qv['meta_query'] );
</ins><span class="cx">                 }
</span><ins>+
+                $qv['meta_query'] = $meta_query;
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         /*
</span><span class="lines">@@ -593,7 +574,15 @@
</span><span class="cx">          * @access protected
</span><span class="cx">          * @since 3.1.0
</span><span class="cx">          *
</span><del>-         * @uses $this-&gt;meta_query
</del><ins>+         * @param array $meta_query List of metadata queries. A single query is an associative array:
+         * - 'key' string The meta key
+         * - 'value' string|array The meta value
+         * - 'compare' (optional) string How to compare the key to the value.
+         *                Possible values: '=', '!=', '&gt;', '&gt;=', '&lt;', '&lt;=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'.
+         *                Default: '='
+         * - 'type' string (optional) The type of the value.
+         *                Possible values: 'NUMERIC', 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED'.
+         *                Default: 'CHAR'
</ins><span class="cx">          *
</span><span class="cx">          * @param string $primary_table
</span><span class="cx">          * @param string $primary_id_column
</span><span class="lines">@@ -601,7 +590,7 @@
</span><span class="cx">          * @param string $meta_id_column
</span><span class="cx">          * @return array( $join_sql, $where_sql )
</span><span class="cx">          */
</span><del>-        function get_meta_sql( $primary_table, $primary_id_column, $meta_table, $meta_id_column ) {
</del><ins>+        function get_meta_sql( $meta_query, $primary_table, $primary_id_column, $meta_table, $meta_id_column ) {
</ins><span class="cx">                 global $wpdb;
</span><span class="cx"> 
</span><span class="cx">                 $clauses = array();
</span><span class="lines">@@ -609,7 +598,7 @@
</span><span class="cx">                 $join = '';
</span><span class="cx">                 $where = '';
</span><span class="cx">                 $i = 0;
</span><del>-                foreach ( $this-&gt;meta_query as $q ) {
</del><ins>+                foreach ( $meta_query as $q ) {
</ins><span class="cx">                         $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
</span><span class="cx">                         $meta_value = isset( $q['value'] ) ? $q['value'] : '';
</span><span class="cx">                         $meta_compare = isset( $q['compare'] ) ? strtoupper( $q['compare'] ) : '=';
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15765 => 15766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php        2010-10-09 10:19:15 UTC (rev 15765)
+++ trunk/wp-includes/query.php        2010-10-09 10:48:13 UTC (rev 15766)
</span><span class="lines">@@ -1081,7 +1081,6 @@
</span><span class="cx">                 unset($this-&gt;posts);
</span><span class="cx">                 unset($this-&gt;query);
</span><span class="cx">                 $this-&gt;query_vars = array();
</span><del>-                $this-&gt;meta_query = array();
</del><span class="cx">                 unset($this-&gt;queried_object);
</span><span class="cx">                 unset($this-&gt;queried_object_id);
</span><span class="cx">                 $this-&gt;post_count = 0;
</span><span class="lines">@@ -2114,7 +2113,7 @@
</span><span class="cx">                         $where .= ')';
</span><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                list( $meta_join, $meta_where ) = $this-&gt;get_meta_sql( $wpdb-&gt;posts, 'ID', $wpdb-&gt;postmeta, 'post_id' );
</del><ins>+                list( $meta_join, $meta_where ) = $this-&gt;get_meta_sql( $q['meta_query'], $wpdb-&gt;posts, 'ID', $wpdb-&gt;postmeta, 'post_id' );
</ins><span class="cx">                 $join .= $meta_join;
</span><span class="cx">                 $where .= $meta_where;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (15765 => 15766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php        2010-10-09 10:19:15 UTC (rev 15765)
+++ trunk/wp-includes/user.php        2010-10-09 10:48:13 UTC (rev 15766)
</span><span class="lines">@@ -458,10 +458,10 @@
</span><span class="cx">                                 $cap_meta_query['compare'] = 'like';
</span><span class="cx">                         }
</span><span class="cx"> 
</span><del>-                        $this-&gt;meta_query[] = $cap_meta_query;
</del><ins>+                        $qv['meta_query'][] = $cap_meta_query;
</ins><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                list( $meta_join, $meta_where ) = $this-&gt;get_meta_sql( $wpdb-&gt;users, 'ID', $wpdb-&gt;usermeta, 'user_id' );
</del><ins>+                list( $meta_join, $meta_where ) = $this-&gt;get_meta_sql( $qv['meta_query'], $wpdb-&gt;users, 'ID', $wpdb-&gt;usermeta, 'user_id' );
</ins><span class="cx">                 $this-&gt;query_from .= $meta_join;
</span><span class="cx">                 $this-&gt;query_where .= $meta_where;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>