From 7d501102425157bb43780138bed64a588b2353b6 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Thu, 23 Jul 2020 18:41:41 +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. git-svn-id: https://develop.svn.wordpress.org/trunk@48582 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/upgrade.php | 8 ++++++-- src/wp-includes/version.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php index d9ec48632f..77487ba2cb 100644 --- a/src/wp-admin/includes/upgrade.php +++ b/src/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/src/wp-includes/version.php b/src/wp-includes/version.php index 4764c8c5cb..6e6354d152 100644 --- a/src/wp-includes/version.php +++ b/src/wp-includes/version.php @@ -20,7 +20,7 @@ $wp_version = '5.5-beta3-48551-src'; * * @global int $wp_db_version */ -$wp_db_version = 48397; +$wp_db_version = 48575; /** * Holds the TinyMCE version.