Changeset 48752

Timestamp:

08/07/2020 04:33:39 PM (6 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.
Reviewed by desrosj, SergeyBiryukov.
Merges [48748] and [48751] to the 5.5 branch.
Fixes #49236.

Location:

branches/5.5

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/upgrade.php (modified) (2 diffs)
• src/wp-includes/comment.php (modified) (2 diffs)
• src/wp-includes/version.php (modified) (1 diff)
• tests/phpunit/tests/comment/wpBatchUpdateCommentType.php (copied) (copied from trunk/tests/phpunit/tests/comment/wpBatchUpdateCommentType.php )

branches/5.5/src/wp-admin/includes/upgrade.php

@@ -2175 +2175 @@
 
         if ( $wp_current_db_version < 48121 ) {
-                update_option( 'finished_updating_comment_type', 0 );
-                wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_update_comment_type_batch' );
-
                 $comment_previously_approved = get_option( 'comment_whitelist', '' );
                 update_option( 'comment_previously_approved', $comment_previously_approved );
@@ -2198 +2195 @@
                 delete_option( 'blacklist_keys' );
                 delete_option( 'blocklist_keys' );
+        }
+
+        if ( $wp_current_db_version < 48748 ) {
+                update_option( 'finished_updating_comment_type', 0 );
+                wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_update_comment_type_batch' );
         }
 }

branches/5.5/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 );
 }

branches/5.5/src/wp-includes/version.php

@@ -21 +21 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 48575;
+$wp_db_version = 48748;
 
 /**