Commit 48a1e526 authored by Jonathan Desrosiers's avatar Jonathan Desrosiers
Browse files

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: https://core.svn.wordpress.org/trunk@48344 1a063a9b-81f0-0310-95a4-ce76da25c4cd
parent ce14d719

wp-admin/includes/upgrade.php

+6 −2
Original line number Diff line number Diff line
@@ -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' );

		}

wp-includes/version.php

+2 −2
Original line number Diff line number Diff line
@@ -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.