Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-24 21:32:51 +02:00
Code Issues Projects Releases Wiki Activity

Install/upgrade: Remove Gutenberg plugin deactivation from upgrade process.

Browse Source 
The Gutenberg plugin will not be deactivated on sites upgrading to WordPress 5.1. This deprecates the `upgrade_500_was_gutenberg_active` option and the `upgrade_500()` function as they are no longer required.

Props peterwilsoncc.
Fixes #46029.


Built from https://develop.svn.wordpress.org/trunk@44732


git-svn-id: http://core.svn.wordpress.org/trunk@44563 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Peter Wilson 2019-02-08 00:16:50 +00:00
parent cddee8b72e
commit c4505be534
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -811,8 +811,8 @@ function upgrade_all() {
upgrade_460();
}
if ( $wp_current_db_version < 43764 ) {
upgrade_500();
if ( $wp_current_db_version < 44719 ) {
upgrade_510();
}
maybe_disable_link_manager();
@ -2097,25 +2097,19 @@ function upgrade_460() {
*
* @ignore
* @since 5.0.0
*
* @global int $wp_current_db_version Current database version.
* @deprecated 5.1.0
*/
function upgrade_500() {
global $wp_current_db_version;
if ( $wp_current_db_version < 43764 ) {
// Allow bypassing Gutenberg plugin deactivation.
if ( defined( 'GUTENBERG_USE_PLUGIN' ) && GUTENBERG_USE_PLUGIN ) {
return;
}
}
$was_active = is_plugin_active( 'gutenberg/gutenberg.php' );
if ( $was_active ) {
// FIXME: Leave until 501 or 510 to clean up.
update_site_option( 'upgrade_500_was_gutenberg_active', '1' );
}
deactivate_plugins( array( 'gutenberg/gutenberg.php' ), true );
}
/**
* Executes changes made in WordPress 5.1.0.
*
* @ignore
* @since 5.1.0
*/
function upgrade_510() {
delete_site_option( 'upgrade_500_was_gutenberg_active' );
}
/**

4
wp-includes/version.php
View File

@ -13,14 +13,14 @@
*
* @global string $wp_version
*/
$wp_version = '5.1-beta3-44731';
$wp_version = '5.1-beta3-44732';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
*
* @global int $wp_db_version
*/
$wp_db_version = 44467;
$wp_db_version = 44719;
/**
* Holds the TinyMCE version