<!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>[17530] trunk/wp-includes/meta.php:
Avoid var name conflict in _get_meta_sql().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17530">17530</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-03-22 20:35:47 +0000 (Tue, 22 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid var name conflict in _get_meta_sql(). Fixes type var passed to get_meta_sql filter. Props Rahe, nacin. fixes <a href="http://trac.wordpress.org/ticket/16825">#16825</a> for trunk</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 (17529 => 17530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2011-03-22 20:28:09 UTC (rev 17529)
+++ trunk/wp-includes/meta.php 2011-03-22 20:35:47 UTC (rev 17530)
</span><span class="lines">@@ -368,19 +368,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><del>- * @param string $meta_type
</del><ins>+ * @param string $type Type of meta
</ins><span class="cx"> * @param string $primary_table
</span><span class="cx"> * @param string $primary_id_column
</span><span class="cx"> * @param object $context (optional) The main query object
</span><span class="cx"> * @return array( 'join' => $join_sql, 'where' => $where_sql )
</span><span class="cx"> */
</span><del>-function _get_meta_sql( $meta_query, $meta_type, $primary_table, $primary_id_column, $context = null ) {
</del><ins>+function _get_meta_sql( $meta_query, $type, $primary_table, $primary_id_column, $context = null ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( ! $meta_table = _get_meta_table( $meta_type ) )
</del><ins>+ if ( ! $meta_table = _get_meta_table( $type ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- $meta_id_column = esc_sql( $meta_type . '_id' );
</del><ins>+ $meta_id_column = esc_sql( $type . '_id' );
</ins><span class="cx">
</span><span class="cx"> $join = '';
</span><span class="cx"> $where = '';
</span><span class="lines">@@ -442,7 +442,7 @@
</span><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><del>- return apply_filters_ref_array( 'get_meta_sql', array( compact( 'join', 'where' ), $meta_query, $meta_type, $primary_table, $primary_id_column, &$context ) );
</del><ins>+ return apply_filters_ref_array( 'get_meta_sql', array( compact( 'join', 'where' ), $meta_query, $type, $primary_table, $primary_id_column, &$context ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>