Ticket #49236: 49236.4.patch

src/wp-includes/comment.php

@@ -3839 +3839 @@
          */
         $comment_batch_size = (int) apply_filters( 'wp_update_comment_type_batch_size', 100 );
 
-        // Update the `comment_type` field value to be `comment` for the next batch of comments.
-        $wpdb->query(
+        // Get the IDs of the comments needing to be updated.
+        $comment_ids = $wpdb->get_col(
                 $wpdb->prepare(
-                        "UPDATE {$wpdb->comments}
-                        SET comment_type = 'comment'
+                        "SELECT comment_ID
+                        FROM {$wpdb->comments}
                         WHERE comment_type = ''
                         ORDER BY comment_ID DESC
                         LIMIT %d",
@@ -3851 +3851 @@
                 )
         );
 
+        if ( count( $comment_ids ) > 0 ) {
+                $comment_ids_in = implode( ',', wp_parse_id_list( $comment_ids ) );
+
+                //Update the `comment_type` field value to be `comment` for the next batch of comments.
+                $wpdb->query(
+                        "UPDATE {$wpdb->comments}
+                        SET comment_type = 'comment'
+                        WHERE comment_type = ''
+                        AND comment_ID IN ({$comment_ids_in})"
+                );
+
+                // Make sure to clean the comment cache.
+                clean_comment_cache( $comment_ids );
+        }
+
         delete_option( $lock_name );
 }
 

new file tests/phpunit/tests/comment/wpBatchUpdateCommentType.php

@@ +1 @@
+<?php
+
+/**
+ * @group  comment
+ * @covers ::_wp_batch_update_comment_type
+ */
+class Tests_Batch_Update_Comment_Type extends WP_UnitTestCase {
+
+        public function test__wp_batch_update_comment_type() {
+                global $wpdb;
+                $comments                = self::factory()->comment->create_many( 3 );
+                $comment_objects         = array();
+                $updated_comment_objects = array();
+                $expected_types          = array();
+                $comment_ids             = implode( ',', $comments );
+
+                clean_comment_cache( $comments );
+
+                $wpdb->query(
+                        "UPDATE {$wpdb->comments}
+                        SET comment_type = ''
+                        WHERE comment_type = 'comment'
+                        AND comment_ID in ({$comment_ids})"
+                );
+
+                foreach ( $comments as $comment_ID ) {
+                        $comment_objects[ $comment_ID ] = get_comment( $comment_ID );
+                }
+
+                $this->assertEmpty( array_filter( wp_list_pluck( $comment_objects, 'comment_type' ) ) );
+
+                add_filter( 'wp_update_comment_type_batch_size', array( $this, 'filter_comment_type_batch_size' ) );
+                add_filter( 'schedule_event', '__return_null' );
+
+                _wp_batch_update_comment_type();
+
+                remove_filter( 'wp_update_comment_type_batch_size', array( $this, 'filter_comment_type_batch_size' ) );
+                remove_filter( 'schedule_event', '__return_null' );
+
+                foreach ( $comments as $comment_ID ) {
+                        $updated_comment_objects[ $comment_ID ] = get_comment( $comment_ID );
+                        $expected_types[ $comment_ID ] = 'comment';
+                }
+
+                $this->assertEquals( $expected_types, wp_list_pluck( $updated_comment_objects, 'comment_type' ) );
+        }
+
+        public function filter_comment_type_batch_size() {
+                return 3;
+        }
+}