Changeset 12930 for trunk/wp-settings.php

Timestamp:

02/02/2010 09:41:17 PM (15 years ago)

Author:

ryan

Message:

Cleanup network plugin loading. Props nacin. see #11644

File:

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

trunk/wp-settings.php

@@ -137 +137 @@
 
 // Load must-use plugins.
-foreach( wp_muplugins_to_load() as $mu_plugin )
+foreach ( wp_load_mu_plugins() as $mu_plugin ) {
     include_once( $mu_plugin );
+}
 unset( $mu_plugin );
-
-// Load network-wide plugins if multisite.
-if ( is_multisite() ) {
-    foreach ( ms_network_plugins() as $plugin_file )
-        include_once( $plugin_file );
-    unset( $plugin_file );
-}
 
 do_action( 'muplugins_loaded' );
@@ -171 +165 @@
 
 // Load active plugins.
-foreach( wp_plugins_to_load() as $plugin )
+foreach ( wp_load_plugins() as $plugin )
     include_once( $plugin );
 unset( $plugin );