mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-04-05 13:14:29 +00:00
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. Props Akeif, Rarst for testing. Fixes #37696. git-svn-id: https://develop.svn.wordpress.org/trunk@38446 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
@@ -990,8 +990,16 @@ class WP_Comment_Query {
|
||||
}
|
||||
|
||||
if ( $uncached_parent_ids ) {
|
||||
$where = 'WHERE ' . $_where . ' AND comment_parent IN (' . implode( ',', array_map( 'intval', $uncached_parent_ids ) ) . ')';
|
||||
$level_comments = $this->db->get_results( "SELECT {$this->db->comments}.comment_ID, {$this->db->comments}.comment_parent {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} ORDER BY comment_date_gmt ASC, comment_ID ASC" );
|
||||
// Fetch this level of comments.
|
||||
$parent_query_args = $this->query_vars;
|
||||
foreach ( $exclude_keys as $exclude_key ) {
|
||||
$parent_query_args[ $exclude_key ] = '';
|
||||
}
|
||||
$parent_query_args['parent__in'] = $uncached_parent_ids;
|
||||
$parent_query_args['no_found_rows'] = true;
|
||||
$parent_query_args['hierarchical'] = false;
|
||||
|
||||
$level_comments = get_comments( $parent_query_args );
|
||||
|
||||
// Cache parent-child relationships.
|
||||
$parent_map = array_fill_keys( $uncached_parent_ids, array() );
|
||||
|
||||
Reference in New Issue
Block a user