<!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>[14478] trunk/wp-includes:
Prevent ambiguous table aliases in wp_post_mime_type_where.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14478">14478</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-06 18:03:05 +0000 (Thu, 06 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent ambiguous table aliases in wp_post_mime_type_where. props stephdau, jfarthing84, fixes <a href="http://trac.wordpress.org/ticket/12750">#12750</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (14477 => 14478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-05-06 17:49:54 UTC (rev 14477)
+++ trunk/wp-includes/post.php 2010-05-06 18:03:05 UTC (rev 14478)
</span><span class="lines">@@ -1573,9 +1573,10 @@
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> *
</span><span class="cx"> * @param string|array $mime_types List of mime types or comma separated string of mime types.
</span><ins>+ * @param string $table_alias Optional. Specify a table alias, if needed.
</ins><span class="cx"> * @return string The SQL AND clause for mime searching.
</span><span class="cx"> */
</span><del>-function wp_post_mime_type_where($post_mime_types) {
</del><ins>+function wp_post_mime_type_where($post_mime_types, $table_alias = '') {
</ins><span class="cx"> $where = '';
</span><span class="cx"> $wildcards = array('', '%', '%/%');
</span><span class="cx"> if ( is_string($post_mime_types) )
</span><span class="lines">@@ -1603,9 +1604,9 @@
</span><span class="cx"> return '';
</span><span class="cx">
</span><span class="cx"> if ( false !== strpos($mime_pattern, '%') )
</span><del>- $wheres[] = "post_mime_type LIKE '$mime_pattern'";
</del><ins>+ $wheres[] = empty($table_alias) ? "post_mime_type LIKE '$mime_pattern'" : "$table_alias.post_mime_type LIKE '$mime_pattern'";
</ins><span class="cx"> else
</span><del>- $wheres[] = "post_mime_type = '$mime_pattern'";
</del><ins>+ $wheres[] = empty($table_alias) ? "post_mime_type = '$mime_pattern'" : "$table_alias.post_mime_type = '$mime_pattern'";
</ins><span class="cx"> }
</span><span class="cx"> if ( !empty($wheres) )
</span><span class="cx"> $where = ' AND (' . join(' OR ', $wheres) . ') ';
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (14477 => 14478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-05-06 17:49:54 UTC (rev 14477)
+++ trunk/wp-includes/query.php 2010-05-06 18:03:05 UTC (rev 14478)
</span><span class="lines">@@ -2026,13 +2026,14 @@
</span><span class="cx"> $post_ids = get_objects_in_term($term_ids, $taxonomy);
</span><span class="cx"> if ( !is_wp_error($post_ids) && !empty($post_ids) ) {
</span><span class="cx"> $whichcat .= " AND $wpdb->posts.ID IN (" . implode(', ', $post_ids) . ") ";
</span><del>- if ( '' === $post_type ) {
</del><ins>+ if ( empty($post_type) ) {
</ins><span class="cx"> $post_type = 'any';
</span><span class="cx"> $post_status_join = true;
</span><span class="cx"> } elseif ( in_array('attachment', (array)$post_type) ) {
</span><span class="cx"> $post_status_join = true;
</span><span class="cx"> }
</span><del>- $q['post_status'] = 'publish';
</del><ins>+ if ( empty($q['post_status']) )
+ $q['post_status'] = 'publish';
</ins><span class="cx"> } else {
</span><span class="cx"> $whichcat = " AND 0 ";
</span><span class="cx"> }
</span><span class="lines">@@ -2083,8 +2084,10 @@
</span><span class="cx">
</span><span class="cx"> // MIME-Type stuff for attachment browsing
</span><span class="cx">
</span><del>- if ( isset($q['post_mime_type']) && '' != $q['post_mime_type'] )
- $whichmimetype = wp_post_mime_type_where($q['post_mime_type']);
</del><ins>+ if ( isset($q['post_mime_type']) && '' != $q['post_mime_type'] ) {
+ $table_alias = $post_status_join ? $wpdb->posts : '';
+ $whichmimetype = wp_post_mime_type_where($q['post_mime_type'], $table_alias);
+ }
</ins><span class="cx">
</span><span class="cx"> $where .= $search . $whichcat . $whichauthor . $whichmimetype;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>