Changeset 36357 for branches/4.4/src/wp-includes/class-wp-comment-query.php

Timestamp:

01/20/2016 05:27:07 AM (4 years ago)

Author:

dd32

Message:

Comments: Use the post-filter WHERE clause when querying for comment descendants.

The descendant query in WP_Comment_Query::fill_descendants() uses the clauses
of the main get_comment_ids() query as a basis, discarding the parent,
parent__in, and parent__not_in clauses. As implemented in WP 4.4 [34546],
the WHERE clause was assembled in such a way that any modifications applied
using the comments_clauses filter were not inherited by fill_descendants().
This resulted in descendant queries that did not always properly filter
results, and sometimes contained syntax errors.

The current changeset fixes the problem by using the post-filter WHERE clause
as the basis for the fill_descendants() query. This change requires a new
approach for eliminating the unneeded parent-related clauses: instead of
eliminating values in an associative array, we must use regular expressions.

Merges [36277] to the 4.4 branch.
Props boonebgorges, firebird75.
Fixes #35192.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-comment-query.php (modified) (4 diffs)

branches/4.4/src/wp-includes/class-wp-comment-query.php

@@ -59 +59 @@
         'limits'  => '',
     );
+
+    /**
+     * SQL WHERE clause.
+     *
+     * Stored after the 'comments_clauses' filter is run on the compiled WHERE sub-clauses.
+     *
+     * @since 4.4.2
+     * @access protected
+     * @var string
+     */
+    protected $filtered_where_clause;
 
     /**
@@ -817 +828 @@
         $groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
 
+        $this->filtered_where_clause = $where;
+
         if ( $where ) {
             $where = 'WHERE ' . $where;
@@ -868 +881 @@
         );
 
-        $where_clauses = $this->sql_clauses['where'];
-        unset(
-            $where_clauses['parent'],
-            $where_clauses['parent__in'],
-            $where_clauses['parent__not_in']
-        );
+        /*
+         * The WHERE clause for the descendant query is the same as for the top-level
+         * query, minus the `parent`, `parent__in`, and `parent__not_in` sub-clauses.
+         */
+        $_where = $this->filtered_where_clause;
+        $exclude_keys = array( 'parent', 'parent__in', 'parent__not_in' );
+        foreach ( $exclude_keys as $exclude_key ) {
+            if ( isset( $this->sql_clauses['where'][ $exclude_key ] ) ) {
+                $clause = $this->sql_clauses['where'][ $exclude_key ];
+
+                // Strip the clause as well as any adjacent ANDs.
+                $pattern = '|(?:AND)?\s*' . $clause . '\s*(?:AND)?|';
+                $_where_parts = preg_split( $pattern, $_where );
+
+                // Remove empties.
+                $_where_parts = array_filter( array_map( 'trim', $_where_parts ) );
+
+                // Reassemble with an AND.
+                $_where = implode( ' AND ', $_where_parts );
+            }
+        }
 
         // Fetch an entire level of the descendant tree at a time.
@@ -883 +911 @@
             }
 
-            $where = 'WHERE ' . implode( ' AND ', $where_clauses ) . ' AND comment_parent IN (' . implode( ',', array_map( 'intval', $parent_ids ) ) . ')';
+            $where = 'WHERE ' . $_where . ' AND comment_parent IN (' . implode( ',', array_map( 'intval', $parent_ids ) ) . ')';
             $comment_ids = $wpdb->get_col( "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} ORDER BY comment_date_gmt ASC, comment_ID ASC" );