Changeset 52165 for trunk/src/wp-admin/includes/update-core.php

Timestamp:

11/15/2021 07:57:28 PM (5 years ago)

Author:

hellofromTonya

Message:

Upgrade/Install: Deactivate the Gutenberg plugin if its version is 11.8 or lower.

Avoid a fatal error due to WP_Theme_JSON_Schema and potentially other classes and/or functions redeclarations when updating to WordPress 5.9 with an incompatible version of the Gutenberg plugin.

This commit uses the same strategy from 5.8. Moves the plugin deactivation code (introduced in [51266]) to a private function for reuse in 5.8, 5.9, and future major releases.

Follow-up to [51180], [51266].

Props hellofromTonya, johnbillion, jorbin.
See #54405.

File:

• trunk/src/wp-admin/includes/update-core.php (modified) (3 diffs)

trunk/src/wp-admin/includes/update-core.php

@@ -1402 +1402 @@
         _upgrade_580_force_deactivate_incompatible_plugins();
 
+        // Deactivate the Gutenberg plugin if its version is 11.8 or lower.
+        _upgrade_590_force_deactivate_incompatible_plugins();
+
         // Upgrade DB with separate request.
         /** This filter is documented in wp-admin/includes/update-core.php */
@@ -1686 +1689 @@
 
 /**
+ * @access private
  * @ignore
  * @since 5.8.0
@@ -1691 +1695 @@
 function _upgrade_580_force_deactivate_incompatible_plugins() {
         if ( defined( 'GUTENBERG_VERSION' ) && version_compare( GUTENBERG_VERSION, '10.7', '<=' ) ) {
-                $deactivated_gutenberg['gutenberg'] = array(
-                        'plugin_name'         => 'Gutenberg',
-                        'version_deactivated' => GUTENBERG_VERSION,
-                        'version_compatible'  => '10.8',
-                );
-                if ( is_plugin_active_for_network( 'gutenberg/gutenberg.php' ) ) {
-                        $deactivated_plugins = get_site_option( 'wp_force_deactivated_plugins', array() );
-                        $deactivated_plugins = array_merge( $deactivated_plugins, $deactivated_gutenberg );
-                        update_site_option( 'wp_force_deactivated_plugins', $deactivated_plugins );
-                } else {
-                        $deactivated_plugins = get_option( 'wp_force_deactivated_plugins', array() );
-                        $deactivated_plugins = array_merge( $deactivated_plugins, $deactivated_gutenberg );
-                        update_option( 'wp_force_deactivated_plugins', $deactivated_plugins );
-                }
-                deactivate_plugins( array( 'gutenberg/gutenberg.php' ), true );
+                _deactivate_gutenberg_when_incompatible_with_wp( '10.8' );
         }
 }
+
+/**
+ * @access private
+ * @ignore
+ * @since 5.9.0
+ */
+function _upgrade_590_force_deactivate_incompatible_plugins() {
+        if ( defined( 'GUTENBERG_VERSION' ) && version_compare( GUTENBERG_VERSION, '11.8', '<=' ) ) {
+                _deactivate_gutenberg_when_incompatible_with_wp( '11.9' );
+        }
+}
+
+/**
+ * Deactivates the Gutenberg plugin when its version is incompatible.
+ *
+ * @access private
+ * @ignore
+ * @since 5.9.0
+ *
+ * @param string $compatible_version The version of Gutenberg plugin that is compatible.
+ */
+function _deactivate_gutenberg_when_incompatible_with_wp( $compatible_version ) {
+        $deactivated_gutenberg['gutenberg'] = array(
+                'plugin_name'         => 'Gutenberg',
+                'version_deactivated' => GUTENBERG_VERSION,
+                'version_compatible'  => $compatible_version,
+        );
+        if ( is_plugin_active_for_network( 'gutenberg/gutenberg.php' ) ) {
+                $deactivated_plugins = get_site_option( 'wp_force_deactivated_plugins', array() );
+                $deactivated_plugins = array_merge( $deactivated_plugins, $deactivated_gutenberg );
+                update_site_option( 'wp_force_deactivated_plugins', $deactivated_plugins );
+        } else {
+                $deactivated_plugins = get_option( 'wp_force_deactivated_plugins', array() );
+                $deactivated_plugins = array_merge( $deactivated_plugins, $deactivated_gutenberg );
+                update_option( 'wp_force_deactivated_plugins', $deactivated_plugins );
+        }
+        deactivate_plugins( array( 'gutenberg/gutenberg.php' ), true );
+}