Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 14:53:08 +02:00
Code Issues Projects Releases Wiki Activity

App Passwords: Regenerate the .htaccess file to add a new rule.

Browse Source 
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.
Built from https://develop.svn.wordpress.org/trunk@49632


git-svn-id: http://core.svn.wordpress.org/trunk@49370 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-11-17 17:24:06 +00:00
parent f97647c207
commit cf75a715c4
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
wp-admin/includes/upgrade.php
View File

@ -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();
}
}
/**

4
wp-includes/version.php
View File

@ -13,14 +13,14 @@
*
* @global string $wp_version
*/
$wp_version = '5.6-beta4-49631';
$wp_version = '5.6-beta4-49632';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
*
* @global int $wp_db_version
*/
$wp_db_version = 49572;
$wp_db_version = 49632;
/**
* Holds the TinyMCE version.