Changeset 57592

Timestamp:

02/12/2024 12:31:29 PM (7 months ago)

Author:

costdev

Message:

Upgrade/Install: Avoid update_option() calls during bootstrap.

[57545] introduced the Plugin Dependencies feature, which contains a new plugin_data option.

Previously, the plugin_data option was being updated during bootstrap and in get_plugins(), causing an error when using the install script as the options database table does not yet exist, and also risked an "out of sync" issue between the database and the cache on websites with heavy traffic.

This removes the calls to update_option() during Core's bootstrap, and guards the call in get_plugins() to ensure that it doesn't run when WordPress is installing.

Follow-up to [57545].

Props desrosj, swisspidy, huzaifaalmesbah, afragen, dd32, azaozz, costdev.
Fixes #60461. See #60457, #60491.

Location:

trunk/src

Files:

• wp-admin/includes/plugin.php (modified) (1 diff)
• wp-includes/load.php (modified) (2 diffs)
• wp-settings.php (modified) (3 diffs)

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

@@ -361 +361 @@
     $cache_plugins[ $plugin_folder ] = $wp_plugins;
     wp_cache_set( 'plugins', $cache_plugins, 'plugins' );
-    update_option( 'plugin_data', $new_plugin_data );
+
+    if ( ! wp_installing() ) {
+        update_option( 'plugin_data', $new_plugin_data );
+    }
 
     return $wp_plugins;

trunk/src/wp-includes/load.php

@@ -987 +987 @@
     $network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
 
-    $invalid_plugins = array();
     foreach ( $active_plugins as $plugin ) {
         if ( ! validate_file( $plugin )                     // $plugin must validate as file.
@@ -996 +995 @@
         ) {
             $plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
-        } else {
-            $invalid_plugins[] = $plugin;
-        }
-    }
-
-    if ( ! empty( $invalid_plugins ) ) {
-        $all_plugin_data = get_option( 'plugin_data', array() );
-
-        if ( ! empty( $all_plugin_data ) ) {
-            foreach ( $invalid_plugins as $invalid_plugin ) {
-                unset( $all_plugin_data[ $invalid_plugin ] );
-            }
-
-            update_option( 'plugin_data', $all_plugin_data );
         }
     }

trunk/src/wp-settings.php

@@ -500 +500 @@
 
 // Load active plugins.
-$all_plugin_data    = get_option( 'plugin_data', array() );
-$failed_plugins     = array();
-$update_plugin_data = false;
+$all_plugin_data = get_option( 'plugin_data', array() );
+$failed_plugins  = array();
 foreach ( wp_get_active_and_valid_plugins() as $plugin ) {
-    $plugin_file = str_replace( trailingslashit( WP_PLUGIN_DIR ), '', $plugin );
-    if ( ! isset( $all_plugin_data[ $plugin_file ] ) ) {
-        require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        $all_plugin_data[ $plugin_file ] = get_plugin_data( WP_PLUGIN_DIR . "/$plugin_file" );
-
-        $update_plugin_data = true;
-    }
-
-    $plugin_headers   = $all_plugin_data[ $plugin_file ];
-    $errors           = array();
-    $requirements     = array(
-        'requires'         => ! empty( $plugin_headers['RequiresWP'] ) ? $plugin_headers['RequiresWP'] : '',
-        'requires_php'     => ! empty( $plugin_headers['RequiresPHP'] ) ? $plugin_headers['RequiresPHP'] : '',
-        'requires_plugins' => ! empty( $plugin_headers['RequiresPlugins'] ) ? $plugin_headers['RequiresPlugins'] : '',
+    $plugin_file    = str_replace( trailingslashit( WP_PLUGIN_DIR ), '', $plugin );
+    $plugin_headers = $all_plugin_data[ $plugin_file ];
+    $errors         = array();
+    $requirements   = array(
+        'requires'     => ! empty( $plugin_headers['RequiresWP'] ) ? $plugin_headers['RequiresWP'] : '',
+        'requires_php' => ! empty( $plugin_headers['RequiresPHP'] ) ? $plugin_headers['RequiresPHP'] : '',
     );
-    $compatible_wp    = is_wp_version_compatible( $requirements['requires'] );
-    $compatible_php   = is_php_version_compatible( $requirements['requires_php'] );
-    $dependencies_met = ! WP_Plugin_Dependencies::has_unmet_dependencies( $plugin_file );
+    $compatible_wp  = is_wp_version_compatible( $requirements['requires'] );
+    $compatible_php = is_php_version_compatible( $requirements['requires_php'] );
 
     $php_update_message = '</p><p>' . sprintf(
@@ -533 +523 @@
     if ( $annotation ) {
         $php_update_message .= '</p><p><em>' . $annotation . '</em>';
-    }
-
-    if ( ! $dependencies_met ) {
-        $errors[] = sprintf(
-            /* translators: %s: The plugin's name. */
-            _x( '%s has unmet dependencies.', 'plugin' ),
-            $plugin_headers['Name']
-        );
     }
 
@@ -602 +584 @@
 unset( $plugin, $_wp_plugin_file );
 
-if ( $update_plugin_data ) {
-    update_option( 'plugin_data', $all_plugin_data );
-}
-
 if ( ! empty( $failed_plugins ) ) {
     add_action(