Changeset 50787

Timestamp:

04/24/2021 06:02:39 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Plugins: When loading a plugin in a "sandbox" on activation, do it in a separate function.

This avoids accidentally overriding some variables in the scope of activate_plugin(), e.g. $silent or $network_wide.

Plugins expecting to have access to $network_wide directly on inclusion should receive it as an argument of the activation hook callback instead, on any of these actions:

• activate_plugin
• activate_{$plugin}
• activated_plugin

Follow-up to [28644].

Props Mike_Cowobo, dd32, DrewAPicture, mensmaximus, SergeyBiryukov.
Fixes #31104.

File:

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

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

@@ -662 +662 @@
         ob_start();
 
-        if ( ! defined( 'WP_SANDBOX_SCRAPING' ) ) {
-            define( 'WP_SANDBOX_SCRAPING', true );
-        }
-
-        wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
-        $_wp_plugin_file = $plugin;
-        include_once WP_PLUGIN_DIR . '/' . $plugin;
-        $plugin = $_wp_plugin_file; // Avoid stomping of the $plugin variable in a plugin.
+        // Load the plugin to test whether it throws any errors.
+        plugin_sandbox_scrape( $plugin );
 
         if ( ! $silent ) {
@@ -733 +727 @@
             return new WP_Error( 'unexpected_output', __( 'The plugin generated unexpected output.' ), $output );
         }
+
         ob_end_clean();
     }