<!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>[16143] trunk/wp-includes: Just pass meta type to get_meta_sql().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16143">16143</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-01 20:34:54 +0000 (Mon, 01 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Just pass meta type to get_meta_sql(). See <a href="http://trac.wordpress.org/ticket/15032">#15032</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpobjectqueryphp">trunk/wp-includes/class-wp-object-query.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="trunkwpincludesclasswpobjectqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-object-query.php (16142 => 16143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-object-query.php 2010-11-01 20:21:29 UTC (rev 16142)
+++ trunk/wp-includes/class-wp-object-query.php 2010-11-01 20:34:54 UTC (rev 16143)
</span><span class="lines">@@ -87,15 +87,19 @@
</span><span class="cx"> * Possible values: 'NUMERIC', 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED'.
</span><span class="cx"> * Default: 'CHAR'
</span><span class="cx"> *
</span><ins>+ * @param string $meta_type
</ins><span class="cx"> * @param string $primary_table
</span><span class="cx"> * @param string $primary_id_column
</span><del>- * @param string $meta_table
- * @param string $meta_id_column
</del><span class="cx"> * @return array( $join_sql, $where_sql )
</span><span class="cx"> */
</span><del>- function get_meta_sql( $meta_query, $primary_table, $primary_id_column, $meta_table, $meta_id_column ) {
</del><ins>+ function get_meta_sql( $meta_query, $meta_type, $primary_table, $primary_id_column ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><ins>+ if ( ! $meta_table = _get_meta_table( $meta_type ) )
+ return false;
+
+ $meta_id_column = esc_sql( $meta_type . '_id' );
+
</ins><span class="cx"> $clauses = array();
</span><span class="cx">
</span><span class="cx"> $join = '';
</span><span class="lines">@@ -157,7 +161,7 @@
</span><span class="cx"> unset( $meta_compare_string );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return apply_filters( 'get_meta_sql', compact( 'join', 'where' ), $meta_query, $primary_table, $primary_id_column, $meta_table, $meta_id_column );
</del><ins>+ return apply_filters( 'get_meta_sql', compact( 'join', 'where' ), $meta_query, $meta_type, $primary_table, $primary_id_column );
</ins><span class="cx"> }
</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 (16142 => 16143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-11-01 20:21:29 UTC (rev 16142)
+++ trunk/wp-includes/query.php 2010-11-01 20:34:54 UTC (rev 16143)
</span><span class="lines">@@ -2146,7 +2146,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty( $q['meta_query'] ) ) {
</span><del>- $clauses = $this->get_meta_sql( $q['meta_query'], $wpdb->posts, 'ID', $wpdb->postmeta, 'post_id' );
</del><ins>+ $clauses = $this->get_meta_sql( $q['meta_query'], 'post', $wpdb->posts, 'ID' );
</ins><span class="cx"> $join .= $clauses['join'];
</span><span class="cx"> $where .= $clauses['where'];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (16142 => 16143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-11-01 20:21:29 UTC (rev 16142)
+++ trunk/wp-includes/user.php 2010-11-01 20:34:54 UTC (rev 16143)
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty( $qv['meta_query'] ) ) {
</span><del>- $clauses = $this->get_meta_sql( $qv['meta_query'], $wpdb->users, 'ID', $wpdb->usermeta, 'user_id' );
</del><ins>+ $clauses = $this->get_meta_sql( $qv['meta_query'], 'user', $wpdb->users, 'ID' );
</ins><span class="cx"> $this->query_from .= $clauses['join'];
</span><span class="cx"> $this->query_where .= $clauses['where'];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>