Changeset 8773

Timestamp:

08/29/2008 06:33:04 PM (16 years ago)

Author:

ryan

Message:

Mike filter suppression. Props DD32. see #7326

File:

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

trunk/wp-includes/query.php

@@ -779 +779 @@
             $qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
 
-        if ( $this->is_posts_page && !$qv['withcomments'] )
+        if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) )
             $this->is_comment_feed = false;
 
@@ -833 +833 @@
         $search = '';
         $groupby = '';
+        $fields = "$wpdb->posts.*";
         $post_status_join = false;
+        $page = 1;
 
         if ( !isset($q['caller_get_posts']) )
@@ -1433 +1435 @@
         }
 
+        $orderby = $q['orderby'];
+
         // Apply post-paging filters on where and join.  Only plugins that
         // manipulate paging queries should use these hooks.
@@ -1439 +1443 @@
             $groupby = apply_filters('posts_groupby', $groupby);
             $join = apply_filters('posts_join_paged', $join);
-            $orderby = apply_filters('posts_orderby', $q['orderby']);
+            $orderby = apply_filters('posts_orderby', $orderby);
             $distinct = apply_filters('posts_distinct', $distinct);
-            $fields = apply_filters('posts_fields', "$wpdb->posts.*");
+            $fields = apply_filters('posts_fields', $fields);
             $limits = apply_filters( 'post_limits', $limits );
         }
@@ -1467 +1471 @@
             $found_rows = 'SQL_CALC_FOUND_ROWS';
 
-        $request = " SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
+        $this->request = " SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
         if ( !$q['suppress_filters'] )
-            $this->request = apply_filters('posts_request', $request);
+            $this->request = apply_filters('posts_request', $this->request);
 
         $this->posts = $wpdb->get_results($this->request);