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
This commit is contained in:
Jonathan Desrosiers 2020-07-23 18:41:41 +00:00
parent b554928e83
commit 7d50110242
2 changed files with 7 additions and 3 deletions

View File

@ -836,7 +836,7 @@ function upgrade_all() {
upgrade_530(); upgrade_530();
} }
if ( $wp_current_db_version < 48121 ) { if ( $wp_current_db_version < 48575 ) {
upgrade_550(); upgrade_550();
} }
@ -2182,10 +2182,14 @@ function upgrade_550() {
delete_option( 'comment_whitelist' ); delete_option( 'comment_whitelist' );
} }
if ( $wp_current_db_version < 48572 ) { if ( $wp_current_db_version < 48575 ) {
// Use more clear and inclusive language. // Use more clear and inclusive language.
$disallowed_list = get_option( 'blacklist_keys' ); $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 ) { if ( false === $disallowed_list ) {
$disallowed_list = get_option( 'blocklist_keys' ); $disallowed_list = get_option( 'blocklist_keys' );
} }

View File

@ -20,7 +20,7 @@ $wp_version = '5.5-beta3-48551-src';
* *
* @global int $wp_db_version * @global int $wp_db_version
*/ */
$wp_db_version = 48397; $wp_db_version = 48575;
/** /**
* Holds the TinyMCE version. * Holds the TinyMCE version.