Changeset 48748

Timestamp:

08/07/2020 02:27:40 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Comments: Update comment cache in the upgrade routine for changing the comment_type DB field value in comments table.

This ensures that comment object cache is cleared after changing the comment type to comment instead of an empty string.

Add a unit test for _wp_batch_update_comment_type().

Follow-up to [47597], [47626], [48225], [48227].

Props imath, westonruter.
Fixes #49236.

Location:

trunk

Files:

• src/wp-includes/comment.php (modified) (2 diffs)
• tests/phpunit/tests/comment/wpBatchUpdateCommentType.php (added)

trunk/src/wp-includes/comment.php

@@ -3840 +3840 @@
     $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 to update.
+    $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
@@ -3852 +3852 @@
     );
 
+    if ( $comment_ids ) {
+        $comment_id_list = implode( ',', $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_id_list})" // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+        );
+
+        // Make sure to clean the comment cache.
+        clean_comment_cache( $comment_ids );
+    }
+
     delete_option( $lock_name );
 }