Changeset 53175

Timestamp:

04/14/2022 12:02:31 AM (2 years ago)

Author:

SergeyBiryukov

Message:

Query: Restore late compact() call for SQL clauses in wp-includes/class-wp-*-query.php.

This addresses a backward compatibility break where posts_groupby and other filters were applied, but their results were subsequently discarded and earlier values were used instead.

Follow-up to [52974].

Props nextend_ramona.
See #54728, ​#meta6273.

Location:

trunk/src/wp-includes

Files:

• class-wp-comment-query.php (modified) (2 diffs)
• class-wp-network-query.php (modified) (2 diffs)
• class-wp-query.php (modified) (2 diffs)
• class-wp-site-query.php (modified) (2 diffs)
• class-wp-term-query.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-comment-query.php

@@ -918 +918 @@
         $where = implode( ' AND ', $this->sql_clauses['where'] );
 
-        $clauses = compact( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+        $clauses = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
 
         /**
@@ -928 +928 @@
          * @param WP_Comment_Query $query   Current instance of WP_Comment_Query (passed by reference).
          */
-        $clauses = apply_filters_ref_array( 'comments_clauses', array( $clauses, &$this ) );
+        $clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $clauses ), &$this ) );
 
         $fields  = isset( $clauses['fields'] ) ? $clauses['fields'] : '';

trunk/src/wp-includes/class-wp-network-query.php

@@ -439 +439 @@
         $groupby = '';
 
-        $clauses = compact( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+        $clauses = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
 
         /**
@@ -449 +449 @@
          * @param WP_Network_Query $query   Current instance of WP_Network_Query (passed by reference).
          */
-        $clauses = apply_filters_ref_array( 'networks_clauses', array( $clauses, &$this ) );
+        $clauses = apply_filters_ref_array( 'networks_clauses', array( compact( $clauses ), &$this ) );
 
         $fields  = isset( $clauses['fields'] ) ? $clauses['fields'] : '';

trunk/src/wp-includes/class-wp-query.php

@@ -2754 +2754 @@
         }
 
-        $clauses = compact( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
+        $clauses = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
 
         /*
@@ -2856 +2856 @@
              * @param WP_Query $query   The WP_Query instance (passed by reference).
              */
-            $clauses = (array) apply_filters_ref_array( 'posts_clauses', array( $clauses, &$this ) );
+            $clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $clauses ), &$this ) );
 
             $where    = isset( $clauses['where'] ) ? $clauses['where'] : '';

trunk/src/wp-includes/class-wp-site-query.php

@@ -647 +647 @@
         $where = implode( ' AND ', $this->sql_clauses['where'] );
 
-        $clauses = compact( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+        $clauses = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
 
         /**
@@ -657 +657 @@
          * @param WP_Site_Query $query   Current instance of WP_Site_Query (passed by reference).
          */
-        $clauses = apply_filters_ref_array( 'sites_clauses', array( $clauses, &$this ) );
+        $clauses = apply_filters_ref_array( 'sites_clauses', array( compact( $clauses ), &$this ) );
 
         $fields  = isset( $clauses['fields'] ) ? $clauses['fields'] : '';

trunk/src/wp-includes/class-wp-term-query.php

@@ -693 +693 @@
         $where = implode( ' AND ', $this->sql_clauses['where'] );
 
-        $clauses = compact( 'fields', 'join', 'where', 'distinct', 'orderby', 'order', 'limits' );
+        $clauses = array( 'fields', 'join', 'where', 'distinct', 'orderby', 'order', 'limits' );
 
         /**
@@ -704 +704 @@
          * @param array    $args       An array of term query arguments.
          */
-        $clauses = apply_filters( 'terms_clauses', $clauses, $taxonomies, $args );
+        $clauses = apply_filters( 'terms_clauses', compact( $clauses ), $taxonomies, $args );
 
         $fields   = isset( $clauses['fields'] ) ? $clauses['fields'] : '';