Changeset 35512

Timestamp:

11/04/2015 09:09:01 PM (11 years ago)

Author:

boonebgorges

Message:

WP_Comment_Query: Fill comment objects from database when cache is unavailable.

This fixes a bug where widgets loaded in a preview or the Customizer are
rendered inside of a wp_suspend_cache_addition() block and thus could not
find comment objects in the cache.

Props rommelxcastro, stevehenty.
Fixes #34138.

Location:

trunk

Files:

• src/wp-includes/class-wp-comment-query.php (modified) (1 diff)
• tests/phpunit/tests/comment/query.php (modified) (1 diff)

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

@@ -413 +413 @@
                 $_comments = array();
                 foreach ( $comment_ids as $comment_id ) {
-                        if ( $_comment = wp_cache_get( $comment_id, 'comment' ) ) {
+                        if ( $_comment = get_comment( $comment_id ) ) {
                                 $_comments[] = $_comment;
                         }

trunk/tests/phpunit/tests/comment/query.php

@@ -2148 +2148 @@
                 $this->assertSame( $num_queries, $wpdb->num_queries );
         }
+
+        /**
+         * @ticket 34138
+         */
+        public function test_comment_objects_should_be_filled_from_cache() {
+                global $wpdb;
+
+                $comments = self::factory()->comment->create_many( 3, array( 'comment_post_ID' => $this->post_id ) );
+                clean_comment_cache( $comments );
+
+                $num_queries = $wpdb->num_queries;
+                $q = new WP_Comment_Query( array(
+                        'post_id' => $this->post_id,
+                        'no_found_rows' => true,
+                        'update_comment_post_cache' => false,
+                        'update_comment_meta_cache' => false,
+                ) );
+
+                // 2 queries should have been fired: one for IDs, one to prime comment caches.
+                $num_queries += 2;
+
+                $found = wp_list_pluck( $q->comments, 'comment_ID' );
+                $this->assertEqualSets( $comments, $found );
+
+                $this->assertSame( $num_queries, $wpdb->num_queries );
+        }
+
+        /**
+         * @ticket 34138
+         */
+        public function test_comment_objects_should_be_fetched_from_database_when_suspend_cache_addition() {
+                $suspend = wp_suspend_cache_addition();
+                wp_suspend_cache_addition( true );
+
+                $c = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id ) );
+
+                $q = new WP_Comment_Query( array(
+                        'post_id' => $this->post_id,
+                ) );
+
+                wp_suspend_cache_addition( $suspend );
+
+                $found = wp_list_pluck( $q->comments, 'comment_ID' );
+                $this->assertEqualSets( array( $c ), $found );
+        }
 }