From 7d3b647a169af1b27cc039124bd5a51beaeaac3e Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Tue, 7 Jul 2020 19:19:03 +0000 Subject: [PATCH] Upgrade/Install: Prevent some 5.5.0 upgrade routines from running twice. This will prevent the options renamed for 5.5.0 from being converted twice. If a new update routine is added before 5.5 is released, the option values would be erased for anyone running `trunk` or nightlies without this change. Props azaozz, desrosj, SergeyBiryukov, whyisjake. Fixes #50413. git-svn-id: https://develop.svn.wordpress.org/trunk@48400 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/upgrade.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php index 0d3b1c1ce1..e3e3dbe707 100644 --- a/src/wp-admin/includes/upgrade.php +++ b/src/wp-admin/includes/upgrade.php @@ -2166,17 +2166,21 @@ function upgrade_530() { * @since 5.5.0 */ function upgrade_550() { + global $wp_current_db_version; + update_option( 'finished_updating_comment_type', 0 ); wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_update_comment_type_batch' ); - // Use more clear and inclusive language. - $blocklist = get_option( 'blacklist_keys', '' ); - update_option( 'blocklist_keys', $blocklist ); - delete_option( 'blacklist_keys' ); + if ( $wp_current_db_version < 48121 ) { + // Use more clear and inclusive language. + $blocklist = get_option( 'blacklist_keys', '' ); + update_option( 'blocklist_keys', $blocklist ); + delete_option( 'blacklist_keys' ); - $comment_previously_approved = get_option( 'comment_whitelist', '' ); - update_option( 'comment_previously_approved', $comment_previously_approved ); - delete_option( 'comment_whitelist' ); + $comment_previously_approved = get_option( 'comment_whitelist', '' ); + update_option( 'comment_previously_approved', $comment_previously_approved ); + delete_option( 'comment_whitelist' ); + } } /**