WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
nacin 2010-07-07 20:35:51 +00:00
parent 9aaac543db
commit 77b0788dc8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/plugin.php
View File

@ -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;