Changeset 48752
- Timestamp:
- 08/07/2020 04:33:39 PM (4 years ago)
- Location:
- branches/5.5
- Files:
-
- 4 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/5.5
- Property svn:mergeinfo changed
/trunk merged: 48748,48751
- Property svn:mergeinfo changed
-
branches/5.5/src/wp-admin/includes/upgrade.php
r48582 r48752 2175 2175 2176 2176 if ( $wp_current_db_version < 48121 ) { 2177 update_option( 'finished_updating_comment_type', 0 );2178 wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_update_comment_type_batch' );2179 2180 2177 $comment_previously_approved = get_option( 'comment_whitelist', '' ); 2181 2178 update_option( 'comment_previously_approved', $comment_previously_approved ); … … 2198 2195 delete_option( 'blacklist_keys' ); 2199 2196 delete_option( 'blocklist_keys' ); 2197 } 2198 2199 if ( $wp_current_db_version < 48748 ) { 2200 update_option( 'finished_updating_comment_type', 0 ); 2201 wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_update_comment_type_batch' ); 2200 2202 } 2201 2203 } -
branches/5.5/src/wp-includes/comment.php
r48658 r48752 3840 3840 $comment_batch_size = (int) apply_filters( 'wp_update_comment_type_batch_size', 100 ); 3841 3841 3842 // Update the `comment_type` field value to be `comment` for the next batch of comments.3843 $ wpdb->query(3842 // Get the IDs of the comments to update. 3843 $comment_ids = $wpdb->get_col( 3844 3844 $wpdb->prepare( 3845 " UPDATE {$wpdb->comments}3846 SET comment_type = 'comment'3845 "SELECT comment_ID 3846 FROM {$wpdb->comments} 3847 3847 WHERE comment_type = '' 3848 3848 ORDER BY comment_ID DESC … … 3852 3852 ); 3853 3853 3854 if ( $comment_ids ) { 3855 $comment_id_list = implode( ',', $comment_ids ); 3856 3857 // Update the `comment_type` field value to be `comment` for the next batch of comments. 3858 $wpdb->query( 3859 "UPDATE {$wpdb->comments} 3860 SET comment_type = 'comment' 3861 WHERE comment_type = '' 3862 AND comment_ID IN ({$comment_id_list})" // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared 3863 ); 3864 3865 // Make sure to clean the comment cache. 3866 clean_comment_cache( $comment_ids ); 3867 } 3868 3854 3869 delete_option( $lock_name ); 3855 3870 } -
branches/5.5/src/wp-includes/version.php
r48739 r48752 21 21 * @global int $wp_db_version 22 22 */ 23 $wp_db_version = 48 575;23 $wp_db_version = 48748; 24 24 25 25 /**
Note: See TracChangeset
for help on using the changeset viewer.