Changeset 3678 for trunk/wp-includes/query.php

Timestamp:

04/02/2006 12:33:10 AM (20 years ago)

Author:

ryan

Message:

Some optimization of the post query. #2604

File:

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

trunk/wp-includes/query.php

@@ -506 +506 @@
         $where = '';
         $limits = '';
-        $distinct = '';
         $join = '';
 
@@ -823 +822 @@
         }
 
-        //$now = gmdate('Y-m-d H:i:59');
-        
-        //only select past-dated posts, except if a logged in user is viewing a single: then, if they
-        //can edit the post, we let them through
-        //if ($pagenow != 'post.php' && $pagenow != 'edit.php' && !($this->is_single && $user_ID)) {
-        //  $where .= " AND post_date_gmt <= '$now'";
-        //  $distinct = 'DISTINCT';
-        //}
-
         if ( $this->is_attachment ) {
             $where .= ' AND (post_type = "attachment")';
@@ -843 +833 @@
             if ( is_admin() )
                 $where .= " OR post_status = 'future' OR post_status = 'draft'";
-            else
-                $distinct = 'DISTINCT';
     
             if ( is_user_logged_in() )
@@ -885 +873 @@
         // manipulate paging queries should use these hooks.
         $where = apply_filters('posts_where_paged', $where);
-        $groupby = " $wpdb->posts.ID ";
+        $groupby = '';
         $groupby = apply_filters('posts_groupby', $groupby);
+        if ( ! empty($groupby) )
+            $groupby = 'GROUP BY ' . $groupby;
         $join = apply_filters('posts_join_paged', $join);
         $orderby = apply_filters('posts_orderby', $q['orderby']); 
-        $request = " SELECT $distinct * FROM $wpdb->posts $join WHERE 1=1" . $where . " GROUP BY " . $groupby . " ORDER BY " . $orderby . " $limits";
+        $request = " SELECT * FROM $wpdb->posts $join WHERE 1=1 $where $groupby ORDER BY $orderby $limits";
         $this->request = apply_filters('posts_request', $request);