From 29b58359edfa4633adeb53f70606e21c96937b60 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 7 Aug 2020 16:30:32 +0000
Subject: [PATCH] Comments: Update DB version number used to trigger the
 upgrade routine for changing the `comment_type` DB field value in comments
 table.

Follow-up to [47597], [47626], [48225], [48227], [48748].

Props desrosj.
See #49236.

git-svn-id: https://develop.svn.wordpress.org/trunk@48751 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/upgrade.php | 8 +++++---
 src/wp-includes/version.php       | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index 77487ba2cb..8cc106f45d 100644
--- a/src/wp-admin/includes/upgrade.php
+++ b/src/wp-admin/includes/upgrade.php
@@ -2174,9 +2174,6 @@ function upgrade_550() {
 	global $wp_current_db_version;
 
 	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' );
-
 		$comment_previously_approved = get_option( 'comment_whitelist', '' );
 		update_option( 'comment_previously_approved', $comment_previously_approved );
 		delete_option( 'comment_whitelist' );
@@ -2198,6 +2195,11 @@ function upgrade_550() {
 		delete_option( 'blacklist_keys' );
 		delete_option( 'blocklist_keys' );
 	}
+
+	if ( $wp_current_db_version < 48748 ) {
+		update_option( 'finished_updating_comment_type', 0 );
+		wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_update_comment_type_batch' );
+	}
 }
 
 /**
diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php
index 583b9434b9..e00f5b1b11 100644
--- a/src/wp-includes/version.php
+++ b/src/wp-includes/version.php
@@ -20,7 +20,7 @@ $wp_version = '5.6-alpha-48683-src';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 48575;
+$wp_db_version = 48748;
 
 /**
  * Holds the TinyMCE version.