Ticket #39142: 39142.patch

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

@@ -946 +946 @@
                         0 => wp_list_pluck( $comments, 'comment_ID' ),
                 );
 
-                /*
-                 * 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 );
-                        }
-                }
-
                 $key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
                 $last_changed = wp_cache_get_last_changed( 'comment' );
 
@@ -990 +968 @@
                         if ( $uncached_parent_ids ) {
                                 // Fetch this level of comments.
                                 $parent_query_args = $this->query_vars;
+                                /*
+                                 * The params for the descendant query is the same as for the top-level
+                                 * query, minus the `parent`, `parent__in`, and `parent__not_in` sub-clauses.
+                                 */
+                                $exclude_keys = array( 'parent', 'parent__in', 'parent__not_in' );
                                 foreach ( $exclude_keys as $exclude_key ) {
                                         $parent_query_args[ $exclude_key ] = '';
                                 }