IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup network plugin loading. Props nacin. see #11644

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12930 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2010-02-02 21:41:17 +00:00
parent 7a4d409064
commit 1592ca9ff2
5 changed files with 78 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
wp-includes/ms-load.php
View File

@@ -22,43 +22,6 @@ function is_subdomain_install() {
return false;
}
/**
* Returns array of sitewide plugin files to be included in global scope.
*
* @access private
* @since 3.0.0
* @return array Files to include
*/
function ms_network_plugins() {
$network_plugins = array();
$deleted_sitewide_plugins = array();
$wpmu_sitewide_plugins = (array) maybe_unserialize( get_site_option( 'wpmu_sitewide_plugins' ) );
foreach ( $wpmu_sitewide_plugins as $plugin_file => $activation_time ) {
if ( !$plugin_file )
continue;
if ( !file_exists( WP_PLUGIN_DIR . '/' . $plugin_file ) )
$deleted_sitewide_plugins[] = $plugin_file;
else
$network_plugins[] = WP_PLUGIN_DIR . '/' . $plugin_file;
}
if ( !empty( $deleted_sitewide_plugins ) ) {
$active_sitewide_plugins = maybe_unserialize( get_site_option( 'active_sitewide_plugins' ) );
/* Remove any deleted plugins from the wpmu_sitewide_plugins array */
foreach ( $deleted_sitewide_plugins as $plugin_file ) {
unset( $wpmu_sitewide_plugins[$plugin_file] );
unset( $active_sitewide_plugins[$plugin_file] );
}
update_site_option( 'wpmu_sitewide_plugins', $wpmu_sitewide_plugins );
update_site_option( 'active_sitewide_plugins', $wpmu_sitewide_plugins );
}
return $network_plugins;
}
/**
* Checks status of current blog.
*