diff --git a/wp-includes/version.php b/wp-includes/version.php index 81eccc33e2..4cec7d8ce3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-alpha-53003'; +$wp_version = '6.0-alpha-53004'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-settings.php b/wp-settings.php index 85b2f2146a..355cb689bb 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -346,7 +346,9 @@ $GLOBALS['wp_plugin_paths'] = array(); // Load must-use plugins. foreach ( wp_get_mu_plugins() as $mu_plugin ) { + $_wp_plugin_file = $mu_plugin; include_once $mu_plugin; + $mu_plugin = $_wp_plugin_file; // Avoid stomping of the $mu_plugin variable in a plugin. /** * Fires once a single must-use plugin has loaded. @@ -357,13 +359,16 @@ foreach ( wp_get_mu_plugins() as $mu_plugin ) { */ do_action( 'mu_plugin_loaded', $mu_plugin ); } -unset( $mu_plugin ); +unset( $mu_plugin, $_wp_plugin_file ); // Load network activated plugins. if ( is_multisite() ) { foreach ( wp_get_active_network_plugins() as $network_plugin ) { wp_register_plugin_realpath( $network_plugin ); + + $_wp_plugin_file = $network_plugin; include_once $network_plugin; + $network_plugin = $_wp_plugin_file; // Avoid stomping of the $network_plugin variable in a plugin. /** * Fires once a single network-activated plugin has loaded. @@ -374,7 +379,7 @@ if ( is_multisite() ) { */ do_action( 'network_plugin_loaded', $network_plugin ); } - unset( $network_plugin ); + unset( $network_plugin, $_wp_plugin_file ); } /** @@ -415,7 +420,10 @@ if ( ! is_multisite() ) { // Load active plugins. foreach ( wp_get_active_and_valid_plugins() as $plugin ) { wp_register_plugin_realpath( $plugin ); + + $_wp_plugin_file = $plugin; include_once $plugin; + $plugin = $_wp_plugin_file; // Avoid stomping of the $plugin variable in a plugin. /** * Fires once a single activated plugin has loaded. @@ -426,7 +434,7 @@ foreach ( wp_get_active_and_valid_plugins() as $plugin ) { */ do_action( 'plugin_loaded', $plugin ); } -unset( $plugin ); +unset( $plugin, $_wp_plugin_file ); // Load pluggable functions. require ABSPATH . WPINC . '/pluggable.php';