vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-01 07:40:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup network plugin loading. Props nacin. see #11644

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@12930 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2010-02-02 21:41:17 +00:00
parent 1d85da4417
commit 2b1691cdf4
5 changed files with 78 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wp-settings.php
View File

@@ -136,16 +136,10 @@ if ( is_multisite() ) {
wp_default_constants( 'wp_included' );
// 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 );
}
unset( $mu_plugin );
do_action( 'muplugins_loaded' );
@@ -170,7 +164,7 @@ require( ABSPATH . WPINC . '/vars.php' );
create_initial_taxonomies();
// Load active plugins.
foreach( wp_plugins_to_load() as $plugin )
foreach ( wp_load_plugins() as $plugin )
include_once( $plugin );
unset( $plugin );