Changeset 48400

Timestamp:

07/07/2020 07:19:03 PM (6 years ago)

Author:

desrosj

Message:

Upgrade/Install: Prevent some 5.5.0 upgrade routines from running twice.

This will prevent the options renamed for 5.5.0 from being converted twice. If a new update routine is added before 5.5 is released, the option values would be erased for anyone running trunk or nightlies without this change.

Props azaozz, desrosj, SergeyBiryukov, whyisjake.
Fixes #50413.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (1 diff)

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

@@ -2167 +2167 @@
  */
 function upgrade_550() {
+        global $wp_current_db_version;
+
         update_option( 'finished_updating_comment_type', 0 );
         wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_update_comment_type_batch' );
 
-        // Use more clear and inclusive language.
-        $blocklist = get_option( 'blacklist_keys', '' );
-        update_option( 'blocklist_keys', $blocklist );
-        delete_option( 'blacklist_keys' );
-
-        $comment_previously_approved = get_option( 'comment_whitelist', '' );
-        update_option( 'comment_previously_approved', $comment_previously_approved );
-        delete_option( 'comment_whitelist' );
+        if ( $wp_current_db_version < 48121 ) {
+                // Use more clear and inclusive language.
+                $blocklist = get_option( 'blacklist_keys', '' );
+                update_option( 'blocklist_keys', $blocklist );
+                delete_option( 'blacklist_keys' );
+
+                $comment_previously_approved = get_option( 'comment_whitelist', '' );
+                update_option( 'comment_previously_approved', $comment_previously_approved );
+                delete_option( 'comment_whitelist' );
+        }
 }