Changeset 8795

Timestamp:

09/01/2008 05:01:47 PM (18 years ago)

Author:

ryan

Message:

Suppress query filters when called from get_posts(). fixes #7326 #7457 for 2.6

Location:

branches/2.6/wp-includes

Files:

• post.php (modified) (1 diff)
• query.php (modified) (8 diffs)

branches/2.6/wp-includes/post.php

@@ -466 +466 @@
                 'exclude' => '', 'meta_key' => '',
                 'meta_value' =>'', 'post_type' => 'post',
-                'post_parent' => 0
+                'post_parent' => 0, 'suppress_filters' => true
         );
 

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 && !$qv['withcomments'] )
+                if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $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']) ) {
@@ -1362 +1367 @@
                 // Apply filters on where and join prior to paging so that any
                 // manipulations to them are reflected in the paging by day queries.
-                $where = apply_filters('posts_where', $where);
-                $join = apply_filters('posts_join', $join);
+                if ( !$q['suppress_filters'] ) {
+                        $where = apply_filters('posts_where', $where);
+                        $join = apply_filters('posts_join', $join);
+                }
 
                 // Paging
@@ -1395 +1402 @@
                         }
 
-                        $cjoin = apply_filters('comment_feed_join', $cjoin);
-                        $cwhere = apply_filters('comment_feed_where', $cwhere);
-                        $cgroupby = apply_filters('comment_feed_groupby', $cgroupby);
+                        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);
+                        }
 
                         $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'));
@@ -1415 +1424 @@
                 }
 
+                $orderby = $q['orderby'];
+
                 // Apply post-paging filters on where and join.  Only plugins that
                 // manipulate paging queries should use these hooks.
-
-                $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 );
+                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 );
+                }
 
                 // Announce current selection parameters.  For use by caching plugins.
@@ -1430 +1442 @@
 
                 // Filter again for the benefit of caching plugins.  Regular plugins should use the hooks above.
-                $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 ( !$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 );
+                }
 
                 if ( ! empty($groupby) )
@@ -1446 +1460 @@
                         $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 = apply_filters('posts_request', $request);
+                $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);
 
                 $this->posts = $wpdb->get_results($this->request);
                 // Raw results filter.  Prior to status checks.
-                $this->posts = apply_filters('posts_results', $this->posts);
+                if ( !$q['suppress_filters'] )
+                        $this->posts = apply_filters('posts_results', $this->posts);
 
                 if ( !empty($this->posts) && $this->is_comment_feed && $this->is_singular ) {
@@ -1498 +1514 @@
                 }
 
-                $this->posts = apply_filters('the_posts', $this->posts);
+                if ( !$q['suppress_filters'] )
+                        $this->posts = apply_filters('the_posts', $this->posts);
 
                 update_post_caches($this->posts);