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


git-svn-id: http://core.svn.wordpress.org/trunk@48169 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/includes/upgrade.php

@@ -2166,9 +2166,12 @@ 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' );
 
+	if ( $wp_current_db_version < 48121 ) {
 		// Use more clear and inclusive language.
 		$blocklist = get_option( 'blacklist_keys', '' );
 		update_option( 'blocklist_keys', $blocklist );
@@ -2178,6 +2181,7 @@ function upgrade_550() {
 		update_option( 'comment_previously_approved', $comment_previously_approved );
 		delete_option( 'comment_whitelist' );
 	}
+}
 
 /**
  * Executes network-level upgrade routines.

wp-includes/version.php

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