Changeset 39532

Timestamp:

12/07/2016 03:51:08 PM (8 years ago)

Author:

boonebgorges

Message:

Comments: Clean up unused code after [38446].

When the direct SQL query was removed in [38446], part of the SQL
concatenation was not removed. This changeset fixes that.

Props david.binda.
Fixes #39142.

File:

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

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

@@ -947 +947 @@
         );
 
-        /*
-         * 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' );
@@ -974 +952 @@
         // Fetch an entire level of the descendant tree at a time.
         $level = 0;
+        $exclude_keys = array( 'parent', 'parent__in', 'parent__not_in' );
         do {
             // Parent-child relationships may be cached. Only query for those that are not.