Ticket #31081: 31081.2.diff

src/wp-includes/comment-template.php

@@ -1202 +1202 @@
         $wp_query->comments = apply_filters( 'comments_array', $comments, $post->ID );
         $comments = &$wp_query->comments;
         $wp_query->comment_count = count($wp_query->comments);
-        update_comment_cache($wp_query->comments);
 
         if ( $separate_comments ) {
                 $wp_query->comments_by_type = separate_comments($comments);

src/wp-includes/comment.php

@@ -893 +893 @@
                 $comments = apply_filters_ref_array( 'the_comments', array( $results, &$this ) );
 
                 wp_cache_add( $cache_key, $comments, 'comment' );
+                if ( '*' === $fields ) {
+                        update_comment_cache( $comments );
+                }
 
                 $this->comments = $comments;
                 return $this->comments;