Ticket #12139: 12139.diff
File 12139.diff, 1.6 KB (added by , 14 years ago) |
---|
-
wp-admin/includes/plugin.php
395 395 if ( is_plugin_active_for_network($plugin) ) { 396 396 // Deactivate network wide 397 397 $do_network = true; 398 unset( $network_current[$plugin]);398 unset( $network_current[ $plugin ] ); 399 399 } else { 400 400 // Deactivate for this blog only 401 $do_blog = true;402 401 $key = array_search( $plugin, (array) $current ); 403 404 if ( false !== $key )402 if ( false !== $key ) { 403 $do_blog = true; 405 404 array_splice( $current, $key, 1 ); 405 } 406 406 } 407 407 408 408 //Used by Plugin updater to internally deactivate plugin, however, not to notify plugins of the fact to prevent plugin output. … … 562 562 563 563 if ( is_multisite() && is_super_admin() ) { 564 564 $network_plugins = (array) get_site_option( 'active_sitewide_plugins', array() ); 565 $plugins = array_merge( $plugins, $network_plugins);565 $plugins = array_merge( $plugins, array_keys( $network_plugins ) ); 566 566 } 567 567 568 568 if ( empty( $plugins ) ) -
wp-admin/plugins.php
477 477 } 478 478 foreach ( (array)$plugins as $plugin_file => $plugin_data) { 479 479 $actions = array(); 480 $is_active = is_plugin_active($plugin_file);481 480 $is_active_for_network = is_plugin_active_for_network($plugin_file); 481 $is_active = $is_active_for_network || is_plugin_active( $plugin_file ); 482 482 483 483 if ( $is_active_for_network && !is_super_admin() ) 484 484 continue;