Changeset 48405

Timestamp:

07/08/2020 10:56:22 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Prevent the upgrade routine for updating the comment_type field in the comments table from running twice.

Follow-up to [47597], [48400].

See #50413, #49236.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (6 diffs)

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

@@ -701 +701 @@
 function upgrade_all() {
     global $wp_current_db_version, $wp_db_version;
+
     $wp_current_db_version = __get_option( 'db_version' );
 
@@ -1871 +1872 @@
 function upgrade_370() {
     global $wp_current_db_version;
+
     if ( $wp_current_db_version < 25824 ) {
         wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
@@ -1887 +1889 @@
 function upgrade_372() {
     global $wp_current_db_version;
+
     if ( $wp_current_db_version < 26148 ) {
         wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
@@ -1902 +1905 @@
 function upgrade_380() {
     global $wp_current_db_version;
+
     if ( $wp_current_db_version < 26691 ) {
         deactivate_plugins( array( 'mp6/mp6.php' ), true );
@@ -1917 +1921 @@
 function upgrade_400() {
     global $wp_current_db_version;
+
     if ( $wp_current_db_version < 29630 ) {
         if ( ! is_multisite() && false === get_option( 'WPLANG' ) ) {
@@ -2169 +2174 @@
     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' );
-
     if ( $wp_current_db_version < 48121 ) {
+        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', '' );