<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[57592] trunk/src: Upgrade/Install: Avoid `update_option()` calls during bootstrap.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/57592">57592</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/57592","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>costdev</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-02-12 12:31:29 +0000 (Mon, 12 Feb 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Upgrade/Install: Avoid `update_option()` calls during bootstrap.
<a href="https://core.trac.wordpress.org/changeset/57545">[57545]</a> 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 <a href="https://core.trac.wordpress.org/changeset/57545">[57545]</a>.
Props desrosj, swisspidy, huzaifaalmesbah, afragen, dd32, azaozz, costdev.
Fixes <a href="https://core.trac.wordpress.org/ticket/60461">#60461</a>. See <a href="https://core.trac.wordpress.org/ticket/60457">#60457</a>, <a href="https://core.trac.wordpress.org/ticket/60491">#60491</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpsettingsphp">trunk/src/wp-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludespluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2024-02-12 12:05:44 UTC (rev 57591)
+++ trunk/src/wp-admin/includes/plugin.php 2024-02-12 12:31:29 UTC (rev 57592)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,8 +360,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_plugins[ $plugin_folder ] = $wp_plugins;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( 'plugins', $cache_plugins, 'plugins' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'plugin_data', $new_plugin_data );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_installing() ) {
+ update_option( 'plugin_data', $new_plugin_data );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $wp_plugins;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesloadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2024-02-12 12:05:44 UTC (rev 57591)
+++ trunk/src/wp-includes/load.php 2024-02-12 12:31:29 UTC (rev 57592)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -986,7 +986,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $invalid_plugins = array();
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $active_plugins as $plugin ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! validate_file( $plugin ) // $plugin must validate as file.
</span><span class="cx" style="display: block; padding: 0 10px"> && str_ends_with( $plugin, '.php' ) // $plugin must end with '.php'.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -995,23 +994,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> && ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins, true ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- $invalid_plugins[] = $plugin;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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 );
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Remove plugins from the list of active plugins when we're on an endpoint
</span><span class="cx" style="display: block; padding: 0 10px"> * that should be protected against WSODs and the plugin is paused.
</span></span></pre></div>
<a id="trunksrcwpsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-settings.php 2024-02-12 12:05:44 UTC (rev 57591)
+++ trunk/src/wp-settings.php 2024-02-12 12:31:29 UTC (rev 57592)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,28 +499,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load active plugins.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$all_plugin_data = get_option( 'plugin_data', array() );
-$failed_plugins = array();
-$update_plugin_data = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$all_plugin_data = get_option( 'plugin_data', array() );
+$failed_plugins = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( wp_get_active_and_valid_plugins() as $plugin ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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'] : '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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'] : '',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $compatible_wp = is_wp_version_compatible( $requirements['requires'] );
+ $compatible_php = is_php_version_compatible( $requirements['requires_php'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $php_update_message = '</p><p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to Update PHP page. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -534,14 +524,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $php_update_message .= '</p><p><em>' . $annotation . '</em>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $dependencies_met ) {
- $errors[] = sprintf(
- /* translators: %s: The plugin's name. */
- _x( '%s has unmet dependencies.', 'plugin' ),
- $plugin_headers['Name']
- );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! $compatible_wp && ! $compatible_php ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors[] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Current WordPress version, 2: Current PHP version, 3: Plugin name, 4: Required WordPress version, 5: Required PHP version. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -601,10 +583,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $plugin, $_wp_plugin_file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $update_plugin_data ) {
- update_option( 'plugin_data', $all_plugin_data );
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $failed_plugins ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_action(
</span><span class="cx" style="display: block; padding: 0 10px"> 'admin_notices',
</span></span></pre>
</div>
</div>
</body>
</html>