Changeset 8766

Timestamp:

08/28/2008 10:30:27 PM (16 years ago)

Author:

ryan

Message:

Suppress query filters when called from get_posts(). see #7326 #7547

Location:

trunk/wp-includes

Files:

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

trunk/wp-includes/post.php

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

trunk/wp-includes/query.php

@@ -838 +838 @@
             $q['caller_get_posts'] = false;
 
+        if ( !isset($q['suppress_filters']) )
+            $q['suppress_filters'] = false;
+
         if ( !isset($q['post_type']) ) {
             if ( $this->is_search )
@@ -1373 +1376 @@
         // 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
@@ -1406 +1411 @@
             }
 
-            $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'));
@@ -1428 +1435 @@
         // 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', $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.
@@ -1441 +1449 @@
 
         // 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) )
@@ -1458 +1468 @@
 
         $request = " SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
-        $this->request = apply_filters('posts_request', $request);
+        if ( !$q['suppress_filters'] )
+            $this->request = apply_filters('posts_request', $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 ) {
@@ -1544 +1556 @@
         }
 
-        $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);