From 99d692ddfedd7af1503611c50b24a1dc3a12c584 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 17 Nov 2020 17:22:32 +0000
Subject: [PATCH] App Passwords: Regenerate the `.htaccess` file to add a new
 rule.

Application Passwords introduced a new Rewrite Rule to handle the Authorization header on certain systems.

This bumps the database version and updates the file so the change is applied to sites upon upgrading to 5.6.

Follow-up to [49534].

Props pbiron, TimothyBlynJacobs, SergeyBiryukov.
Fixes #51723.

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

diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index ca95940b49..a7002cb121 100644
--- a/src/wp-admin/includes/upgrade.php
+++ b/src/wp-admin/includes/upgrade.php
@@ -874,7 +874,7 @@ function upgrade_all() {
 		upgrade_550();
 	}
 
-	if ( $wp_current_db_version < 49572 ) {
+	if ( $wp_current_db_version < 49632 ) {
 		upgrade_560();
 	}
 
@@ -2247,19 +2247,33 @@ function upgrade_550() {
  * @since 5.6.0
  */
 function upgrade_560() {
-	global $wpdb;
+	global $wp_current_db_version, $wpdb;
 
-	// Clean up the `post_category` column removed from schema in version 2.8.0.
-	// Its presence may conflict with WP_Post::__get().
-	$post_category_exists = $wpdb->get_var( "SHOW COLUMNS FROM $wpdb->posts LIKE 'post_category'" );
-	if ( ! is_null( $post_category_exists ) ) {
-		$wpdb->query( "ALTER TABLE $wpdb->posts DROP COLUMN `post_category`" );
+	if ( $wp_current_db_version < 49572 ) {
+		/*
+		 * Clean up the `post_category` column removed from schema in version 2.8.0.
+		 * Its presence may conflict with `WP_Post::__get()`.
+		 */
+		$post_category_exists = $wpdb->get_var( "SHOW COLUMNS FROM $wpdb->posts LIKE 'post_category'" );
+		if ( ! is_null( $post_category_exists ) ) {
+			$wpdb->query( "ALTER TABLE $wpdb->posts DROP COLUMN `post_category`" );
+		}
+
+		/*
+		 * When upgrading from WP < 5.6.0 set the core major auto-updates option to `unset` by default.
+		 * This overrides the same option from populate_options() that is intended for new installs.
+		 * See https://core.trac.wordpress.org/ticket/51742.
+		 */
+		update_option( 'auto_update_core_major', 'unset' );
 	}
 
-	// When upgrading from WP < 5.6.0 set the core major auto-updates option to `unset` by default.
-	// This overrides the same option from populate_options() that is intended for new installs.
-	// See https://core.trac.wordpress.org/ticket/51742.
-	update_option( 'auto_update_core_major', 'unset' );
+	if ( $wp_current_db_version < 49632 ) {
+		/*
+		 * Regenerate the .htaccess file to add the `HTTP_AUTHORIZATION` rewrite rule.
+		 * See https://core.trac.wordpress.org/ticket/51723.
+		 */
+		save_mod_rewrite_rules();
+	}
 }
 
 /**
diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php
index d52ba22b4c..64322f3f57 100644
--- a/src/wp-includes/version.php
+++ b/src/wp-includes/version.php
@@ -20,7 +20,7 @@ $wp_version = '5.6-beta4-49560-src';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 49572;
+$wp_db_version = 49632;
 
 /**
  * Holds the TinyMCE version.