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

Timestamp:

10/11/2010 03:04:44 PM (14 years ago)

Author:

scribu

Message:

Introduce wp_query_clauses filter. Fixes #14997

File:

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

trunk/wp-includes/query.php

@@ -2187 +2187 @@
         // manipulate paging queries should use these hooks.
         if ( !$q['suppress_filters'] ) {
+            $distinct   = apply_filters_ref_array( 'posts_distinct',    array( $distinct, &$this ) );
+            $fields     = apply_filters_ref_array( 'posts_fields',      array( $fields, &$this ) );
             $where      = apply_filters_ref_array( 'posts_where_paged', array( $where, &$this ) );
+            $join       = apply_filters_ref_array( 'posts_join_paged',  array( $join, &$this ) );
             $groupby    = apply_filters_ref_array( 'posts_groupby',     array( $groupby, &$this ) );
-            $join       = apply_filters_ref_array( 'posts_join_paged',  array( $join, &$this ) );
             $orderby    = apply_filters_ref_array( 'posts_orderby',     array( $orderby, &$this ) );
-            $distinct   = apply_filters_ref_array( 'posts_distinct',    array( $distinct, &$this ) );
-            $limits     = apply_filters_ref_array( 'post_limits',       array( $limits, &$this ) );
-            $fields     = apply_filters_ref_array( 'posts_fields',      array( $fields, &$this ) );
+            $limits     = apply_filters_ref_array( 'post_limits',       array( $limits, &$this ) ); 
+
+            // Also apply a filter on all clauses at once, for convenience
+            $clauses = array();
+            foreach ( array('distinct', 'fields', 'where', 'join', 'groupby', 'orderby', 'limits') as $var ) {
+                $clauses[ $var ] = $$var;
+                unset( $$var ); // so we can use EXTR_SKIP below
+            }
+
+            $clauses = apply_filters_ref_array( 'wp_query_clauses', array( $clauses, &$this ) );
+
+            extract( $clauses, EXTR_SKIP );
+            unset( $clauses );
         }
 
@@ -2201 +2213 @@
         // Filter again for the benefit of caching plugins.  Regular plugins should use the hooks above.
         if ( !$q['suppress_filters'] ) {
+            $distinct   = apply_filters_ref_array( 'posts_distinct_request',array( $distinct, &$this ) );
+            $fields     = apply_filters_ref_array( 'posts_fields_request',  array( $fields, &$this ) );
             $where      = apply_filters_ref_array( 'posts_where_request',   array( $where, &$this ) );
-            $groupby    = apply_filters_ref_array( 'posts_groupby_request',     array( $groupby, &$this ) );
             $join       = apply_filters_ref_array( 'posts_join_request',    array( $join, &$this ) );
-            $orderby    = apply_filters_ref_array( 'posts_orderby_request',     array( $orderby, &$this ) );
-            $distinct   = apply_filters_ref_array( 'posts_distinct_request',    array( $distinct, &$this ) );
-            $fields     = apply_filters_ref_array( 'posts_fields_request',      array( $fields, &$this ) );
-            $limits     = apply_filters_ref_array( 'post_limits_request',       array( $limits, &$this ) );
+            $groupby    = apply_filters_ref_array( 'posts_groupby_request', array( $groupby, &$this ) );
+            $orderby    = apply_filters_ref_array( 'posts_orderby_request', array( $orderby, &$this ) );
+            $limits     = apply_filters_ref_array( 'post_limits_request',   array( $limits, &$this ) );
         }