Ticket #31081: 31081.diff

src/wp-includes/comment.php

@@ -771 +771 @@
                         return array_map( 'intval', $this->comments );
                 }
 
                 $results = $wpdb->get_results( $this->request );
                 /**
                  * Filter the comment query results.
                  *
                  * @since 3.1.0
                  *
                  * @param array            $results  An array of comments.
                  * @param WP_Comment_Query &$this    Current instance of WP_Comment_Query, passed by reference.
                  */
                 $comments = apply_filters_ref_array( 'the_comments', array( $results, &$this ) );
 
                 wp_cache_add( $cache_key, $comments, 'comment' );
+                if ( '*' == $fields ) {
+                        update_comment_cache( $comments );
+                }
 
                 return $comments;
         }
 
         /**
          * Used internally to generate an SQL string for searching across multiple columns
          *
          * @access protected
          * @since 3.1.0
          *
          * @param string $string
          * @param array $cols
          * @return string
          */
         protected function get_search_sql( $string, $cols ) {

src/wp-includes/comment-template.php

@@ -1172 +1172 @@
         }
 
         $comments = get_comments( $comment_args );
 
         /**
          * Filter the comments array.
          *
          * @since 2.1.0
          *
          * @param array $comments Array of comments supplied to the comments template.
          * @param int   $post_ID  Post ID.
          */
         $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);
                 $comments_by_type = &$wp_query->comments_by_type;
         }
 
         $overridden_cpage = false;
         if ( '' == get_query_var('cpage') && get_option('page_comments') ) {
                 set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
                 $overridden_cpage = true;
         }
 
         if ( !defined('COMMENTS_TEMPLATE') )
                 define('COMMENTS_TEMPLATE', true);