Changeset 44732 for trunk/src/wp-admin/includes/upgrade.php

Timestamp:

02/08/2019 12:15:54 AM (8 years ago)

Author:

peterwilsoncc

Message:

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.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (2 diffs)

trunk/src/wp-admin/includes/upgrade.php

@@ -812 +812 @@
         }
 
-        if ( $wp_current_db_version < 43764 ) {
-                upgrade_500();
+        if ( $wp_current_db_version < 44719 ) {
+                upgrade_510();
         }
 
@@ -2098 +2098 @@
  * @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' );
 }