Ticket #37184: 37184.diff

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

@@ -394 +394 @@
                         $last_changed = microtime();
                         wp_cache_set( 'last_changed', $last_changed, 'comment' );
                 }
-                $cache_key = "get_comment_ids:$key:$last_changed";
 
-                $comment_ids = wp_cache_get( $cache_key, 'comment' );
-                if ( false === $comment_ids ) {
+                $cache_key   = "get_comments:$key:$last_changed";
+                $cache_value = wp_cache_get( $cache_key, 'sites' );
+                if ( false === $cache_value ) {
                         $comment_ids = $this->get_comment_ids();
-                        wp_cache_add( $cache_key, $comment_ids, 'comment' );
-                }
+                        if ( $comment_ids ) {
+                                $this->set_found_comments();
+                        }
 
+                        $cache_value = array(
+                                'comment_ids'    => $comment_ids,
+                                'found_comments' => $this->found_comments,
+                                'max_num_pages'  => $this->max_num_pages,
+                        );
+                        wp_cache_add( $cache_key, $cache_value, 'sites' );
+                } else {
+                        $comment_ids          = $cache_value['comment_ids'];
+                        $this->found_comments = $cache_value['found_comments'];
+                        $this->max_num_pages  = $cache_value['max_num_pages'];
+                } 
+
                 // If querying for a count only, there's nothing more to do.
                 if ( $this->query_vars['count'] ) {
                         // $comment_ids is actually a count in this case.
@@ -412 +425 @@
 
                 $this->comment_count = count( $this->comments );
 
-                if ( $comment_ids && $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
-                        /**
-                         * Filters the query used to retrieve found comment count.
-                         *
-                         * @since 4.4.0
-                         *
-                         * @param string           $found_comments_query SQL query. Default 'SELECT FOUND_ROWS()'.
-                         * @param WP_Comment_Query $comment_query        The `WP_Comment_Query` instance.
-                         */
-                        $found_comments_query = apply_filters( 'found_comments_query', 'SELECT FOUND_ROWS()', $this );
-                        $this->found_comments = (int) $wpdb->get_var( $found_comments_query );
-
-                        $this->max_num_pages = ceil( $this->found_comments / $this->query_vars['number'] );
-                }
-
                 if ( 'ids' == $this->query_vars['fields'] ) {
                         $this->comments = $comment_ids;
                         return $this->comments;
@@ -903 +901 @@
         }
 
         /**
+         * Populates found_comments and max_num_pages properties for the current query
+         * if the limit clause was used.
+         *
+         * @since 4.6.0
+         * @access private
+         *
+         * @global wpdb $wpdb WordPress database abstraction object.
+         */
+        private function set_found_comments() {
+                global $wpdb;
+
+                if ( $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
+                        /**
+                         * Filters the query used to retrieve found comment count.
+                         *
+                         * @since 4.4.0
+                         *
+                         * @param string $found_comments_query SQL query. Default 'SELECT FOUND_ROWS()'.
+                         * @param WP_Comment_Query $comment_query The `WP_Comment_Query` instance.
+                         */
+                        $found_comments_query = apply_filters( 'found_comments_query', 'SELECT FOUND_ROWS()', $this );
+
+                        $this->found_comments   = (int) $wpdb->get_var( $found_comments_query );
+                        $this->max_num_pages = ceil( $this->found_comments / $this->query_vars['number'] );
+                }
+        }
+
+        /**
          * Fetch descendants for located comments.
          *
          * Instead of calling `get_children()` separately on each child comment, we do a single set of queries to fetch