WordPress.org

Make WordPress Core


Ignore:
Timestamp:
09/01/2016 03:14:16 PM (4 years ago)
Author:
jeremyfelt
Message:

Comments: Don't do direct SQL query when fetching decendants.

The SQL query was built using the clauses compiled when querying for
top-level comments. But in cases where the top-level comment query
results are already in the cache, the SQL clauses are not built, and
so are unavailable for fill_descendants(). Instead, we call
get_comments(), using modified versions of the parameters passed
to the main WP_Comment_Query class.

Merge of [38446] to the 4.6 branch.

Props boonebgorges, Akeif, Rarst for testing.
Fixes #37696.

Location:
branches/4.6
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.6

  • branches/4.6/src/wp-includes/class-wp-comment-query.php

    r38121 r38497  
    996996
    997997            if ( $uncached_parent_ids ) {
    998                 $where = 'WHERE ' . $_where . ' AND comment_parent IN (' . implode( ',', array_map( 'intval', $uncached_parent_ids ) ) . ')';
    999                 $level_comments = $wpdb->get_results( "SELECT $wpdb->comments.comment_ID, $wpdb->comments.comment_parent {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} ORDER BY comment_date_gmt ASC, comment_ID ASC" );
     998                // Fetch this level of comments.
     999                $parent_query_args = $this->query_vars;
     1000                foreach ( $exclude_keys as $exclude_key ) {
     1001                    $parent_query_args[ $exclude_key ] = '';
     1002                }
     1003                $parent_query_args['parent__in']    = $uncached_parent_ids;
     1004                $parent_query_args['no_found_rows'] = true;
     1005                $parent_query_args['hierarchical']  = false;
     1006
     1007                $level_comments = get_comments( $parent_query_args );
    10001008
    10011009                // Cache parent-child relationships.
Note: See TracChangeset for help on using the changeset viewer.