From da1091030269b125494bc22a96eded6c80873c7e Mon Sep 17 00:00:00 2001 From: dd32 Date: Wed, 20 Jan 2010 07:37:53 +0000 Subject: [PATCH] Typo fix in Network Plugins. Props nacin. See #11881 git-svn-id: http://svn.automattic.com/wordpress/trunk@12772 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/ms-load.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php index 9d98c17a4..b59768615 100644 --- a/wp-includes/ms-load.php +++ b/wp-includes/ms-load.php @@ -53,19 +53,19 @@ function ms_network_settings() { 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 ) ) { + if ( !file_exists( WP_PLUGIN_DIR . '/' . $plugin_file ) ) $deleted_sitewide_plugins[] = $plugin_file; - } else { - $network_plugins = WP_PLUGIN_DIR . '/' . $plugin_file; - } + else + $network_plugins[] = WP_PLUGIN_DIR . '/' . $plugin_file; } - if ( isset( $deleted_sitewide_plugins ) ) { + 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 */