Changeset 48582

Timestamp:

07/23/2020 06:41:41 PM (6 years ago)

Author:

desrosj

Message:

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.

Location:

trunk/src

Files:

• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/src/wp-admin/includes/upgrade.php

@@ -837 +837 @@
         }
 
-        if ( $wp_current_db_version < 48121 ) {
+        if ( $wp_current_db_version < 48575 ) {
                 upgrade_550();
         }
@@ -2183 +2183 @@
         }
 
-        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' );

trunk/src/wp-includes/version.php

@@ -21 +21 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 48397;
+$wp_db_version = 48575;
 
 /**