sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert accidental changes to WP_Query made in [15887]. See #14163

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@15888 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
scribu 2010-10-21 14:06:52 +00:00
parent a3ef15ffc0
commit 8315655230
1 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
wp-includes/query.php
View File

@ -1185,11 +1185,10 @@ class WP_Query extends WP_Object_Query {
, 'preview' , 'preview'
, 's' , 's'
, 'sentence' , 'sentence'
, 'fields'
); );
foreach ( $keys as $key ) { foreach ( $keys as $key ) {
if ( !isset($array[$key]) ) if ( !isset($array[$key]))
$array[$key] = ''; $array[$key] = '';
} }
@ -1197,7 +1196,7 @@ class WP_Query extends WP_Object_Query {
'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and'); 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and');
foreach ( $array_keys as $key ) { foreach ( $array_keys as $key ) {
if ( !isset($array[$key]) ) if ( !isset($array[$key]))
$array[$key] = array(); $array[$key] = array();
} }
return $array; return $array;
@ -1649,7 +1648,7 @@ class WP_Query extends WP_Object_Query {
$join = ''; $join = '';
$search = ''; $search = '';
$groupby = ''; $groupby = '';
$fields = ''; $fields = "$wpdb->posts.*";
$post_status_join = false; $post_status_join = false;
$page = 1; $page = 1;
@ -1730,17 +1729,6 @@ class WP_Query extends WP_Object_Query {
else else
$q['no_found_rows'] = false; $q['no_found_rows'] = false;
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.*";
}
// If a month is specified in the querystring, load that month // If a month is specified in the querystring, load that month
if ( $q['m'] ) { if ( $q['m'] ) {
$q['m'] = '' . preg_replace('|[^0-9]|', '', $q['m']); $q['m'] = '' . preg_replace('|[^0-9]|', '', $q['m']);
@ -2284,7 +2272,6 @@ class WP_Query extends WP_Object_Query {
$groupby = 'GROUP BY ' . $groupby; $groupby = 'GROUP BY ' . $groupby;
if ( !empty( $orderby ) ) if ( !empty( $orderby ) )
$orderby = 'ORDER BY ' . $orderby; $orderby = 'ORDER BY ' . $orderby;
$found_rows = ''; $found_rows = '';
if ( !$q['no_found_rows'] && !empty($limits) ) if ( !$q['no_found_rows'] && !empty($limits) )
$found_rows = 'SQL_CALC_FOUND_ROWS'; $found_rows = 'SQL_CALC_FOUND_ROWS';
@ -2293,24 +2280,7 @@ class WP_Query extends WP_Object_Query {
if ( !$q['suppress_filters'] ) if ( !$q['suppress_filters'] )
$this->request = apply_filters_ref_array('posts_request', array( $this->request, &$this ) ); $this->request = apply_filters_ref_array('posts_request', array( $this->request, &$this ) );
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;
}
$this->posts = $wpdb->get_results($this->request); $this->posts = $wpdb->get_results($this->request);
// Raw results filter. Prior to status checks. // Raw results filter. Prior to status checks.
if ( !$q['suppress_filters'] ) if ( !$q['suppress_filters'] )
$this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) ); $this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) );