WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Plugins: Avoid stomping of some variables in `wp-settings.php`. 

This changeset decreases the chance of accidentally overwriting some variables located in `wp-settings.php`, as the chance of overriding a variable called `$_wp_plugin_file` would be lower than for `$plugin`, `$mu_plugin` or `$network_plugin`.

Props stevegrunwell, joyously, peterwilsoncc, ocean90, SergeyBiryukov, jrf, azouamauriac.
Fixes #55432.

Built from https://develop.svn.wordpress.org/trunk@53004


git-svn-id: http://core.svn.wordpress.org/trunk@52593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
audrasjb 2022-03-28 13:59:02 +00:00
parent 8761c4cefd
commit 1c07680a7a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

14
wp-settings.php
View File

@ -346,7 +346,9 @@ $GLOBALS['wp_plugin_paths'] = array();
// Load must-use plugins. // Load must-use plugins.
foreach ( wp_get_mu_plugins() as $mu_plugin ) { foreach ( wp_get_mu_plugins() as $mu_plugin ) {
$_wp_plugin_file = $mu_plugin;
include_once $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. * 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 ); do_action( 'mu_plugin_loaded', $mu_plugin );
} }
unset( $mu_plugin ); unset( $mu_plugin, $_wp_plugin_file );
// Load network activated plugins. // Load network activated plugins.
if ( is_multisite() ) { if ( is_multisite() ) {
foreach ( wp_get_active_network_plugins() as $network_plugin ) { foreach ( wp_get_active_network_plugins() as $network_plugin ) {
wp_register_plugin_realpath( $network_plugin ); wp_register_plugin_realpath( $network_plugin );
$_wp_plugin_file = $network_plugin;
include_once $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. * Fires once a single network-activated plugin has loaded.
@ -374,7 +379,7 @@ if ( is_multisite() ) {
*/ */
do_action( 'network_plugin_loaded', $network_plugin ); 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. // Load active plugins.
foreach ( wp_get_active_and_valid_plugins() as $plugin ) { foreach ( wp_get_active_and_valid_plugins() as $plugin ) {
wp_register_plugin_realpath( $plugin ); wp_register_plugin_realpath( $plugin );
$_wp_plugin_file = $plugin;
include_once $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. * 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 ); do_action( 'plugin_loaded', $plugin );
} }
unset( $plugin ); unset( $plugin, $_wp_plugin_file );
// Load pluggable functions. // Load pluggable functions.
require ABSPATH . WPINC . '/pluggable.php'; require ABSPATH . WPINC . '/pluggable.php';