Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 06:57:35 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
Built from https://develop.svn.wordpress.org/trunk@48748


git-svn-id: http://core.svn.wordpress.org/trunk@48510 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-08-07 14:29:02 +00:00
parent 5221a27593
commit c64297ce61
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wp-includes/comment.php
View File

@ -3839,11 +3839,11 @@ function _wp_batch_update_comment_type() {
*/ */
$comment_batch_size = (int) apply_filters( 'wp_update_comment_type_batch_size', 100 ); $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. // Get the IDs of the comments to update.
$wpdb->query( $comment_ids = $wpdb->get_col(
$wpdb->prepare( $wpdb->prepare(
"UPDATE {$wpdb->comments} "SELECT comment_ID
SET comment_type = 'comment' FROM {$wpdb->comments}
WHERE comment_type = '' WHERE comment_type = ''
ORDER BY comment_ID DESC ORDER BY comment_ID DESC
LIMIT %d", LIMIT %d",
@ -3851,6 +3851,21 @@ function _wp_batch_update_comment_type() {
) )
); );
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 ); delete_option( $lock_name );
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.6-alpha-48745'; $wp_version = '5.6-alpha-48748';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.