Changeset 15888

Timestamp:

10/21/2010 02:06:52 PM (16 years ago)

Author:

scribu

Message:

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

File:

• trunk/wp-includes/query.php (modified) (6 diffs)

trunk/wp-includes/query.php

@@ -1186 +1186 @@
                         , 's'
                         , 'sentence'
-                        , 'fields'
                 );
 
                 foreach ( $keys as $key ) {
-                        if ( !isset($array[$key]) )
+                        if ( !isset($array[$key]))
                                 $array[$key] = '';
                 }
@@ -1198 +1197 @@
 
                 foreach ( $array_keys as $key ) {
-                        if ( !isset($array[$key]) )
+                        if ( !isset($array[$key]))
                                 $array[$key] = array();
                 }
@@ -1650 +1649 @@
                 $search = '';
                 $groupby = '';
-                $fields = '';
+                $fields = "$wpdb->posts.*";
                 $post_status_join = false;
                 $page = 1;
@@ -1730 +1729 @@
                 else
                         $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
@@ -2285 +2273 @@
                 if ( !empty( $orderby ) )
                         $orderby = 'ORDER BY ' . $orderby;
-
                 $found_rows = '';
                 if ( !$q['no_found_rows'] && !empty($limits) )
@@ -2294 +2281 @@
                         $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);
-
                 // Raw results filter.  Prior to status checks.
                 if ( !$q['suppress_filters'] )