Ticket #16894: 16894.4.diff

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

@@ -161 +161 @@
          *     @type array        $type__in            Include comments from a given array of comment types. Default empty.
          *     @type array        $type__not_in        Exclude comments from a given array of comment types. Default empty.
          *     @type int          $user_id             Include comments for a specific user ID. Default empty.
+         *     @type bool         $update_comment_meta_cache Whether to prime the metadata cache for found comments.
+         *                                                   Default: true.
          * }
          */
         public function __construct( $query = '' ) {
@@ -201 +203 @@
                         'meta_value' => '',
                         'meta_query' => '',
                         'date_query' => null, // See WP_Date_Query
+                        'update_comment_meta_cache' => true,
                 );
 
                 if ( ! empty( $query ) ) {
@@ -698 +701 @@
 
                 wp_cache_add( $cache_key, $comments, 'comment' );
                 if ( '*' === $fields ) {
-                        update_comment_cache( $comments );
+                        update_comment_cache( $comments, $this->query_vars['update_comment_meta_cache'] );
                 }
 
                 $this->comments = $comments;

src/wp-includes/comment-functions.php

@@ -2357 +2357 @@
  * cache using the comment group with the key using the ID of the comments.
  *
  * @since 2.3.0
+ * @since 4.4.0 Introduced the `$update_meta_cache` parameter.
  *
  * @param array $comments Array of comment row objects
  */
-function update_comment_cache($comments) {
+function update_comment_cache( $comments, $update_meta_cache = true ) {
         foreach ( (array) $comments as $comment )
                 wp_cache_add($comment->comment_ID, $comment, 'comment');
+
+        if ( $update_meta_cache ) {
+                $comment_ids = wp_list_pluck( $comments, 'comment_ID' );
+                update_meta_cache( 'comment', $comment_ids );
+        }
 }
 
 //