From 2fc4e48d075e5809aedbf9820f2e9e88421ebcbc Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@git.wordpress.org>
Date: Tue, 30 Aug 2016 14:48:00 +0000
Subject: [PATCH] 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
---
 src/wp-includes/class-wp-comment-query.php | 12 +++++-
 tests/phpunit/tests/comment/query.php      | 49 ++++++++++++++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/class-wp-comment-query.php b/src/wp-includes/class-wp-comment-query.php
index 715f0aae8d..573115a952 100644
--- a/src/wp-includes/class-wp-comment-query.php
+++ b/src/wp-includes/class-wp-comment-query.php
@@ -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() );
diff --git a/tests/phpunit/tests/comment/query.php b/tests/phpunit/tests/comment/query.php
index 1ab4f7f668..4710d64001 100644
--- a/tests/phpunit/tests/comment/query.php
+++ b/tests/phpunit/tests/comment/query.php
@@ -2494,6 +2494,55 @@ class Tests_Comment_Query extends WP_UnitTestCase {
 		$this->assertSame( $num_queries, $wpdb->num_queries );
 	}
 
+	/**
+	 * @ticket 37696
+	 */
+	public function test_hierarchy_should_be_filled_when_cache_is_incomplete() {
+		global $wpdb;
+
+		$p = self::factory()->post->create();
+		$comment_1 = self::factory()->comment->create( array(
+			'comment_post_ID' => $p,
+			'comment_approved' => '1',
+		) );
+		$comment_2 = self::factory()->comment->create( array(
+			'comment_post_ID' => $p,
+			'comment_approved' => '1',
+			'comment_parent' => $comment_1,
+		) );
+		$comment_3 = self::factory()->comment->create( array(
+			'comment_post_ID' => $p,
+			'comment_approved' => '1',
+			'comment_parent' => $comment_1,
+		) );
+		$comment_4 = self::factory()->comment->create( array(
+			'comment_post_ID' => $p,
+			'comment_approved' => '1',
+			'comment_parent' => $comment_2,
+		) );
+
+		// Prime cache.
+		$q1 = new WP_Comment_Query( array(
+			'post_id' => $p,
+			'hierarchical' => true,
+		) );
+		$q1_ids = wp_list_pluck( $q1->comments, 'comment_ID' );
+		$this->assertEqualSets( array( $comment_1, $comment_2, $comment_3, $comment_4 ), $q1_ids );
+
+		// Delete one of the parent caches.
+		$last_changed = wp_cache_get( 'last_changed', 'comment' );
+		$key = md5( serialize( wp_array_slice_assoc( $q1->query_vars, array_keys( $q1->query_var_defaults ) ) ) );
+		$cache_key = "get_comment_child_ids:$comment_2:$key:$last_changed";
+		wp_cache_delete( $cache_key, 'comment' );
+
+		$q2 = new WP_Comment_Query( array(
+			'post_id' => $p,
+			'hierarchical' => true,
+		) );
+		$q2_ids = wp_list_pluck( $q2->comments, 'comment_ID' );
+		$this->assertEqualSets( $q1_ids, $q2_ids );
+	}
+
 	/**
 	 * @ticket 27571
 	 */