Changes in branches/2.6/wp-includes/query.php [8795:8559]

File:

• branches/2.6/wp-includes/query.php (modified) (8 diffs)

branches/2.6/wp-includes/query.php

@@ -776 +776 @@
             $qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
 
-        if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) )
+        if ( $this->is_posts_page && !$qv['withcomments'] )
             $this->is_comment_feed = false;
 
@@ -830 +830 @@
         $search = '';
         $groupby = '';
-        $fields = "$wpdb->posts.*";
         $post_status_join = false;
-        $page = 1;
-
-        if ( !isset($q['suppress_filters']) )
-            $q['suppress_filters'] = false;
 
         if ( !isset($q['post_type']) ) {
@@ -1367 +1362 @@
         // Apply filters on where and join prior to paging so that any
         // manipulations to them are reflected in the paging by day queries.
-        if ( !$q['suppress_filters'] ) {
-            $where = apply_filters('posts_where', $where);
-            $join = apply_filters('posts_join', $join);
-        }
+        $where = apply_filters('posts_where', $where);
+        $join = apply_filters('posts_join', $join);
 
         // Paging
@@ -1402 +1395 @@
             }
 
-            if ( !$q['suppress_filters'] ) {
-                $cjoin = apply_filters('comment_feed_join', $cjoin);
-                $cwhere = apply_filters('comment_feed_where', $cwhere);
-                $cgroupby = apply_filters('comment_feed_groupby', $cgroupby);
-            }
+            $cjoin = apply_filters('comment_feed_join', $cjoin);
+            $cwhere = apply_filters('comment_feed_where', $cwhere);
+            $cgroupby = apply_filters('comment_feed_groupby', $cgroupby);
 
             $this->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss'));
@@ -1424 +1415 @@
         }
 
-        $orderby = $q['orderby'];
-
         // Apply post-paging filters on where and join.  Only plugins that
         // manipulate paging queries should use these hooks.
-        if ( !$q['suppress_filters'] ) {
-            $where = apply_filters('posts_where_paged', $where);
-            $groupby = apply_filters('posts_groupby', $groupby);
-            $join = apply_filters('posts_join_paged', $join);
-            $orderby = apply_filters('posts_orderby', $orderby);
-            $distinct = apply_filters('posts_distinct', $distinct);
-            $fields = apply_filters('posts_fields', $fields);
-            $limits = apply_filters( 'post_limits', $limits );
-        }
+
+        $where = apply_filters('posts_where_paged', $where);
+        $groupby = apply_filters('posts_groupby', $groupby);
+        $join = apply_filters('posts_join_paged', $join);
+        $orderby = apply_filters('posts_orderby', $q['orderby']);
+        $distinct = apply_filters('posts_distinct', $distinct);
+        $fields = apply_filters('posts_fields', "$wpdb->posts.*");
+        $limits = apply_filters( 'post_limits', $limits );
 
         // Announce current selection parameters.  For use by caching plugins.
@@ -1442 +1430 @@
 
         // Filter again for the benefit of caching plugins.  Regular plugins should use the hooks above.
-        if ( !$q['suppress_filters'] ) {
-            $where = apply_filters('posts_where_request', $where);
-            $groupby = apply_filters('posts_groupby_request', $groupby);
-            $join = apply_filters('posts_join_request', $join);
-            $orderby = apply_filters('posts_orderby_request', $orderby);
-            $distinct = apply_filters('posts_distinct_request', $distinct);
-            $fields = apply_filters('posts_fields_request', $fields);
-            $limits = apply_filters( 'post_limits_request', $limits );
-        }
+        $where = apply_filters('posts_where_request', $where);
+        $groupby = apply_filters('posts_groupby_request', $groupby);
+        $join = apply_filters('posts_join_request', $join);
+        $orderby = apply_filters('posts_orderby_request', $orderby);
+        $distinct = apply_filters('posts_distinct_request', $distinct);
+        $fields = apply_filters('posts_fields_request', $fields);
+        $limits = apply_filters( 'post_limits_request', $limits );
 
         if ( ! empty($groupby) )
@@ -1460 +1446 @@
             $found_rows = 'SQL_CALC_FOUND_ROWS';
 
-        $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', $this->request);
+        $request = " SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
+        $this->request = apply_filters('posts_request', $request);
 
         $this->posts = $wpdb->get_results($this->request);
         // Raw results filter.  Prior to status checks.
-        if ( !$q['suppress_filters'] )
-            $this->posts = apply_filters('posts_results', $this->posts);
+        $this->posts = apply_filters('posts_results', $this->posts);
 
         if ( !empty($this->posts) && $this->is_comment_feed && $this->is_singular ) {
@@ -1514 +1498 @@
         }
 
-        if ( !$q['suppress_filters'] )
-            $this->posts = apply_filters('the_posts', $this->posts);
+        $this->posts = apply_filters('the_posts', $this->posts);
 
         update_post_caches($this->posts);