Cleanup network plugin loading. Props nacin. see #11644

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
+1 -13
View File
@@ -1932,19 +1932,7 @@ Thanks!
}
add_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
function mu_filter_plugins_list( $active_plugins ) {
$active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
if ( !$active_sitewide_plugins )
return $active_plugins;
$plugins = array_merge( (array) $active_plugins, array_keys( (array) $active_sitewide_plugins ) );
sort( $plugins );
return $plugins;
}
add_filter( 'active_plugins', 'mu_filter_plugins_list' );
/**
/**
* Whether to force SSL on content.
*
* @since 2.8.5