<!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>[15888] trunk/wp-includes/query.php:
Revert accidental changes to WP_Query made in [15887].</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15888">15888</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-21 14:06:52 +0000 (Thu, 21 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert accidental changes to WP_Query made in <a href="http://trac.wordpress.org/changeset/15887">[15887]</a>. See <a href="http://trac.wordpress.org/ticket/14163">#14163</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15887 => 15888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-10-21 14:03:25 UTC (rev 15887)
+++ trunk/wp-includes/query.php 2010-10-21 14:06:52 UTC (rev 15888)
</span><span class="lines">@@ -1185,11 +1185,10 @@
</span><span class="cx"> , 'preview'
</span><span class="cx"> , 's'
</span><span class="cx"> , 'sentence'
</span><del>- , 'fields'
</del><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> foreach ( $keys as $key ) {
</span><del>- if ( !isset($array[$key]) )
</del><ins>+ if ( !isset($array[$key]))
</ins><span class="cx"> $array[$key] = '';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1197,7 +1196,7 @@
</span><span class="cx"> 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and');
</span><span class="cx">
</span><span class="cx"> foreach ( $array_keys as $key ) {
</span><del>- if ( !isset($array[$key]) )
</del><ins>+ if ( !isset($array[$key]))
</ins><span class="cx"> $array[$key] = array();
</span><span class="cx"> }
</span><span class="cx"> return $array;
</span><span class="lines">@@ -1649,7 +1648,7 @@
</span><span class="cx"> $join = '';
</span><span class="cx"> $search = '';
</span><span class="cx"> $groupby = '';
</span><del>- $fields = '';
</del><ins>+ $fields = "$wpdb->posts.*";
</ins><span class="cx"> $post_status_join = false;
</span><span class="cx"> $page = 1;
</span><span class="cx">
</span><span class="lines">@@ -1730,17 +1729,6 @@
</span><span class="cx"> else
</span><span class="cx"> $q['no_found_rows'] = false;
</span><span class="cx">
</span><del>- switch ( $q['fields'] ) {
- case 'ids':
- $fields = "$wpdb->posts.ID";
- break;
- case 'id=>parent':
- $fields = "$wpdb->posts.ID, $wpdb->posts.post_parent";
- break;
- default:
- $fields = "$wpdb->posts.*";
- }
-
</del><span class="cx"> // If a month is specified in the querystring, load that month
</span><span class="cx"> if ( $q['m'] ) {
</span><span class="cx"> $q['m'] = '' . preg_replace('|[^0-9]|', '', $q['m']);
</span><span class="lines">@@ -2284,7 +2272,6 @@
</span><span class="cx"> $groupby = 'GROUP BY ' . $groupby;
</span><span class="cx"> if ( !empty( $orderby ) )
</span><span class="cx"> $orderby = 'ORDER BY ' . $orderby;
</span><del>-
</del><span class="cx"> $found_rows = '';
</span><span class="cx"> if ( !$q['no_found_rows'] && !empty($limits) )
</span><span class="cx"> $found_rows = 'SQL_CALC_FOUND_ROWS';
</span><span class="lines">@@ -2293,24 +2280,7 @@
</span><span class="cx"> if ( !$q['suppress_filters'] )
</span><span class="cx"> $this->request = apply_filters_ref_array('posts_request', array( $this->request, &$this ) );
</span><span class="cx">
</span><del>- if ( 'ids' == $q['fields'] ) {
- $this->posts = $wpdb->get_col($this->request);
-
- return $this->posts;
- }
-
- if ( 'id=>parent' == $q['fields'] ) {
- $this->posts = $wpdb->get_results($this->request);
-
- $r = array();
- foreach ( $this->posts as $post )
- $r[ $post->ID ] = $post->post_parent;
-
- return $r;
- }
-
</del><span class="cx"> $this->posts = $wpdb->get_results($this->request);
</span><del>-
</del><span class="cx"> // Raw results filter. Prior to status checks.
</span><span class="cx"> if ( !$q['suppress_filters'] )
</span><span class="cx"> $this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) );
</span></span></pre>
</div>
</div>
</body>
</html>