From a8521d48acddca57858bcf9e577fc3107ab3f352 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Tue, 7 Jul 2020 19:21:06 +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.
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 | 18 +++++++++++-------
 wp-includes/version.php       |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 0d3b1c1ce1..e3e3dbe707 100644
--- a/wp-admin/includes/upgrade.php
+++ b/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' );
+	}
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c933ca152a..96110c4383 100644
--- a/wp-includes/version.php
+++ b/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.