Changeset 57622

Timestamp:

02/13/2024 01:28:06 PM (8 months ago)

Author:

costdev

Message:

Upgrade/Install: Only check plugins whose data is already stored.

In [57592], some update_option() calls were removed from bootstrapping. However, this also removed a check to ensure an array key existed, and populated it if not.

Scaffolding tests by WP-CLI revealed that a plugin in the active_plugins option may not have data already stored within the plugin_data option, causing a PHP warning for an undefined array key. This data will be added the next time get_plugins() is called.

This adds a condition to ensure the requirements checks are only performed on plugins whose data is already stored in the plugin_data option.

Follow-up to [57592].

Props swissspidy, hellofromTonya, costdev.
Fixes #60461.

File:

• trunk/src/wp-settings.php (modified) (1 diff)

trunk/src/wp-settings.php

@@ -504 +504 @@
 $plugins_dir_strlen = strlen( trailingslashit( WP_PLUGIN_DIR ) );
 foreach ( wp_get_active_and_valid_plugins() as $plugin ) {
-    $plugin_file    = substr( $plugin, $plugins_dir_strlen );
-    $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'] );
-
-    $php_update_message = '</p><p>' . sprintf(
-        /* translators: %s: URL to Update PHP page. */
-        __( '<a href="%s">Learn more about updating PHP</a>.' ),
-        esc_url( wp_get_update_php_url() )
-    );
-
-    $annotation = wp_get_update_php_annotation();
-
-    if ( $annotation ) {
-        $php_update_message .= '</p><p><em>' . $annotation . '</em>';
-    }
-
-    if ( ! $compatible_wp && ! $compatible_php ) {
-        $errors[] = sprintf(
-            /* translators: 1: Current WordPress version, 2: Current PHP version, 3: Plugin name, 4: Required WordPress version, 5: Required PHP version. */
-            _x( '<strong>Error:</strong> Current versions of WordPress (%1$s) and PHP (%2$s) do not meet minimum requirements for %3$s. The plugin requires WordPress %4$s and PHP %5$s.', 'plugin' ),
-            get_bloginfo( 'version' ),
-            PHP_VERSION,
-            $plugin_headers['Name'],
-            $requirements['requires'],
-            $requirements['requires_php']
-        ) . $php_update_message;
-    } elseif ( ! $compatible_php ) {
-        $errors[] = sprintf(
-            /* translators: 1: Current PHP version, 2: Plugin name, 3: Required PHP version. */
-            _x( '<strong>Error:</strong> Current PHP version (%1$s) does not meet minimum requirements for %2$s. The plugin requires PHP %3$s.', 'plugin' ),
-            PHP_VERSION,
-            $plugin_headers['Name'],
-            $requirements['requires_php']
-        ) . $php_update_message;
-    } elseif ( ! $compatible_wp ) {
-        $errors[] = sprintf(
-            /* translators: 1: Current WordPress version, 2: Plugin name, 3: Required WordPress version. */
-            _x( '<strong>Error:</strong> Current WordPress version (%1$s) does not meet minimum requirements for %2$s. The plugin requires WordPress %3$s.', 'plugin' ),
-            get_bloginfo( 'version' ),
-            $plugin_headers['Name'],
-            $requirements['requires']
+    $plugin_file = substr( $plugin, $plugins_dir_strlen );
+
+    /*
+     * Skip any plugins that have not been added to the 'plugin_data' option yet.
+     *
+     * Some plugin files may be added locally and activated, but will not yet be
+     * added to the 'plugin_data' option. This causes the 'active_plugins' option
+     * and the 'plugin_data' option to be temporarily out of sync until the next
+     * call to `get_plugins()`.
+     */
+    if ( isset( $all_plugin_data[ $plugin_file ] ) ) {
+        $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'] : '',
         );
-    }
-
-    if ( ! empty( $errors ) ) {
-        $failed_plugins[ $plugin_file ] = '';
-        foreach ( $errors as $error ) {
-            $failed_plugins[ $plugin_file ] .= wp_get_admin_notice(
-                $error,
-                array(
-                    'type'        => 'error',
-                    'dismissible' => true,
-                )
+        $compatible_wp  = is_wp_version_compatible( $requirements['requires'] );
+        $compatible_php = is_php_version_compatible( $requirements['requires_php'] );
+
+        $php_update_message = '</p><p>' . sprintf(
+            /* translators: %s: URL to Update PHP page. */
+            __( '<a href="%s">Learn more about updating PHP</a>.' ),
+            esc_url( wp_get_update_php_url() )
+        );
+
+        $annotation = wp_get_update_php_annotation();
+
+        if ( $annotation ) {
+            $php_update_message .= '</p><p><em>' . $annotation . '</em>';
+        }
+
+        if ( ! $compatible_wp && ! $compatible_php ) {
+            $errors[] = sprintf(
+                /* translators: 1: Current WordPress version, 2: Current PHP version, 3: Plugin name, 4: Required WordPress version, 5: Required PHP version. */
+                _x( '<strong>Error:</strong> Current versions of WordPress (%1$s) and PHP (%2$s) do not meet minimum requirements for %3$s. The plugin requires WordPress %4$s and PHP %5$s.', 'plugin' ),
+                get_bloginfo( 'version' ),
+                PHP_VERSION,
+                $plugin_headers['Name'],
+                $requirements['requires'],
+                $requirements['requires_php']
+            ) . $php_update_message;
+        } elseif ( ! $compatible_php ) {
+            $errors[] = sprintf(
+                /* translators: 1: Current PHP version, 2: Plugin name, 3: Required PHP version. */
+                _x( '<strong>Error:</strong> Current PHP version (%1$s) does not meet minimum requirements for %2$s. The plugin requires PHP %3$s.', 'plugin' ),
+                PHP_VERSION,
+                $plugin_headers['Name'],
+                $requirements['requires_php']
+            ) . $php_update_message;
+        } elseif ( ! $compatible_wp ) {
+            $errors[] = sprintf(
+                /* translators: 1: Current WordPress version, 2: Plugin name, 3: Required WordPress version. */
+                _x( '<strong>Error:</strong> Current WordPress version (%1$s) does not meet minimum requirements for %2$s. The plugin requires WordPress %3$s.', 'plugin' ),
+                get_bloginfo( 'version' ),
+                $plugin_headers['Name'],
+                $requirements['requires']
             );
         }
-        continue;
+
+        if ( ! empty( $errors ) ) {
+            $failed_plugins[ $plugin_file ] = '';
+            foreach ( $errors as $error ) {
+                $failed_plugins[ $plugin_file ] .= wp_get_admin_notice(
+                    $error,
+                    array(
+                        'type'        => 'error',
+                        'dismissible' => true,
+                    )
+                );
+            }
+            continue;
+        }
     }