From 77b0788dc808c3d789584790cb6957e83ce7d2c1 Mon Sep 17 00:00:00 2001 From: nacin Date: Wed, 7 Jul 2010 20:35:51 +0000 Subject: [PATCH] Only ask for active_sitewide_plugins in deactivate_plugins() if we're running multisite. git-svn-id: http://svn.automattic.com/wordpress/trunk@15376 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/plugin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 2ff21f8c90..eab56adec4 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -515,7 +515,8 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false) { * @param bool $silent Optional, default is false. Prevent calling deactivate hook. */ function deactivate_plugins( $plugins, $silent = false ) { - $network_current = get_site_option( 'active_sitewide_plugins', array() ); + if ( is_multisite() ) + $network_current = get_site_option( 'active_sitewide_plugins', array() ); $current = get_option( 'active_plugins', array() ); $do_blog = $do_network = false;