From 2c2508f98c7559a463216aadc501dc930f7ea383 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Thu, 23 Jul 2020 18:43:04 +0000
Subject: [PATCH] General: Ensure the database upgrades from [48575] are run.

This corrects the database version to match the commit number the upgrade changes were made.

See #50413.
Built from https://develop.svn.wordpress.org/trunk@48582


git-svn-id: http://core.svn.wordpress.org/trunk@48344 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/upgrade.php | 8 ++++++--
 wp-includes/version.php       | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index d9ec48632f..77487ba2cb 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -836,7 +836,7 @@ function upgrade_all() {
 		upgrade_530();
 	}
 
-	if ( $wp_current_db_version < 48121 ) {
+	if ( $wp_current_db_version < 48575 ) {
 		upgrade_550();
 	}
 
@@ -2182,10 +2182,14 @@ function upgrade_550() {
 		delete_option( 'comment_whitelist' );
 	}
 
-	if ( $wp_current_db_version < 48572 ) {
+	if ( $wp_current_db_version < 48575 ) {
 		// Use more clear and inclusive language.
 		$disallowed_list = get_option( 'blacklist_keys' );
 
+		/*
+		 * This option key was briefly renamed `blocklist_keys`.
+		 * Account for sites that have this key present when the original key does not exist.
+		 */
 		if ( false === $disallowed_list ) {
 			$disallowed_list = get_option( 'blocklist_keys' );
 		}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ad31096ce8..09b9334261 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,14 +13,14 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-beta3-48581';
+$wp_version = '5.5-beta3-48582';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 48397;
+$wp_db_version = 48575;
 
 /**
  * Holds the TinyMCE version.