Ticket #41346: 41346.2.diff

src/wp-settings.php

@@ -283 +283 @@
 foreach ( wp_get_mu_plugins() as $mu_plugin ) {
         include_once( $mu_plugin );
 
+        $mu_plugin_basename = str_replace( WPMU_PLUGIN_DIR . '/', '', $mu_plugin );
+
         /**
          * Fires once a single must-use plugin has loaded.
          *
          * @since 5.1.0
          *
-         * @param string $mu_plugin Loaded plugin's basename.
+         * @param string $mu_plugin_basename Loaded plugin's basename.
+         * @param string $mu_plugin          Full path to the plugin's main file.
          */
-        do_action( 'mu_plugin_loaded', $mu_plugin );
+        do_action( 'mu_plugin_loaded', $mu_plugin_basename, $mu_plugin );
 }
 unset( $mu_plugin );
 
@@ -300 +303 @@
                 wp_register_plugin_realpath( $network_plugin );
                 include_once( $network_plugin );
 
+                $network_plugin_basename = str_replace( WP_PLUGIN_DIR . '/', '', $network_plugin );
+
                 /**
                  * Fires once a single network-activated plugin has loaded.
                  *
                  * @since 5.1.0
                  *
-                 * @param string $network_plugin Loaded plugin's basename.
+                 * @param string $network_plugin_basename Loaded plugin's basename.
+                 * @param string $network_plugin          Full path to the plugin's main file.
                  */
-                do_action( 'network_plugin_loaded', $network_plugin );
+                do_action( 'network_plugin_loaded', $network_plugin_basename, $network_plugin );
         }
         unset( $network_plugin );
 }
@@ -347 +353 @@
         wp_register_plugin_realpath( $plugin );
         include_once( $plugin );
 
+        $plugin_basename = str_replace( WP_PLUGIN_DIR . '/', '', $plugin );
+
         /**
          * Fires once a single activated plugin has loaded.
          *
          * @since 5.1.0
          *
-         * @param string $plugin Loaded plugin's basename.
+         * @param string $plugin_basename Loaded plugin's basename.
+         * @param string $plugin          Full path to the plugin's main file.
          */
-        do_action( 'plugin_loaded', $plugin );
+        do_action( 'plugin_loaded', $plugin_basename, $plugin );
 }
 unset( $plugin );