Changeset 53004

Timestamp:

03/28/2022 01:57:08 PM (3 years ago)

Author:

audrasjb

Message:

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.

File:

• trunk/src/wp-settings.php (modified) (6 diffs)

trunk/src/wp-settings.php

@@ -347 +347 @@
 // 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.
 
     /**
@@ -358 +360 @@
     do_action( 'mu_plugin_loaded', $mu_plugin );
 }
-unset( $mu_plugin );
+unset( $mu_plugin, $_wp_plugin_file );
 
 // Load network activated plugins.
@@ -364 +366 @@
     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.
 
         /**
@@ -375 +380 @@
         do_action( 'network_plugin_loaded', $network_plugin );
     }
-    unset( $network_plugin );
+    unset( $network_plugin, $_wp_plugin_file );
 }
 
@@ -416 +421 @@
 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.
 
     /**
@@ -427 +435 @@
     do_action( 'plugin_loaded', $plugin );
 }
-unset( $plugin );
+unset( $plugin, $_wp_plugin_file );
 
 // Load pluggable functions.