Ticket #55432: 55432.diff

src/wp-settings.php

@@ -361 +361 @@
 
 // Load network activated plugins.
 if ( is_multisite() ) {
-        foreach ( wp_get_active_network_plugins() as $network_plugin ) {
-                wp_register_plugin_realpath( $network_plugin );
-                include_once $network_plugin;
+        foreach ( wp_get_active_network_plugins() as $_wp_network_plugin_file ) {
+                wp_register_plugin_realpath( $_wp_network_plugin_file );
+                include_once $_wp_network_plugin_file;
 
                 /**
                  * Fires once a single network-activated plugin has loaded.
@@ -370 +370 @@
                  *
                  * @since 5.1.0
                  *
-                 * @param string $network_plugin Full path to the plugin's main file.
+                 * @param string $_wp_network_plugin_file Full path to the plugin's main file.
                  */
-                do_action( 'network_plugin_loaded', $network_plugin );
+                do_action( 'network_plugin_loaded', $_wp_network_plugin_file );
         }
-        unset( $network_plugin );
+        unset( $_wp_network_plugin_file );
 }
 
 /**
@@ -413 +413 @@
 }
 
 // Load active plugins.
-foreach ( wp_get_active_and_valid_plugins() as $plugin ) {
-        wp_register_plugin_realpath( $plugin );
-        include_once $plugin;
+foreach ( wp_get_active_and_valid_plugins() as $_wp_plugin_file ) {
+        wp_register_plugin_realpath( $_wp_plugin_file );
+        include_once $_wp_plugin_file;
 
         /**
          * Fires once a single activated plugin has loaded.
@@ -422 +422 @@
          *
          * @since 5.1.0
          *
-         * @param string $plugin Full path to the plugin's main file.
+         * @param string $_wp_plugin_file Full path to the plugin's main file.
          */
-        do_action( 'plugin_loaded', $plugin );
+        do_action( 'plugin_loaded', $_wp_plugin_file );
 }
-unset( $plugin );
+unset( $_wp_plugin_file );
 
 // Load pluggable functions.
 require ABSPATH . WPINC . '/pluggable.php';