From c4505be5343f88f0dd5a0c51ab7271f1aaf46c05 Mon Sep 17 00:00:00 2001
From: Peter Wilson <wilson@peterwilson.cc>
Date: Fri, 8 Feb 2019 00:16:50 +0000
Subject: [PATCH] Install/upgrade: Remove Gutenberg plugin deactivation from
 upgrade process.

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
---
 wp-admin/includes/upgrade.php | 30 ++++++++++++------------------
 wp-includes/version.php       |  4 ++--
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 32d853cb05..5a9733f88c 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -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' );
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0250385421..236075f38a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -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