Ticket #12139: 12139.diff

wp-admin/includes/plugin.php

@@ -395 +395 @@
                 if ( is_plugin_active_for_network($plugin) ) {
                         // Deactivate network wide
                         $do_network = true;
-                        unset($network_current[$plugin]);
+                        unset( $network_current[ $plugin ] );
                 } else {
                         // Deactivate for this blog only
-                        $do_blog = true;
                         $key = array_search( $plugin, (array) $current );
-
-                        if ( false !== $key )
+                        if ( false !== $key ) {
+                                $do_blog = true;
                                 array_splice( $current, $key, 1 );
+                        }
                 }
 
                 //Used by Plugin updater to internally deactivate plugin, however, not to notify plugins of the fact to prevent plugin output.
@@ -562 +562 @@
 
         if ( is_multisite() && is_super_admin() ) {
                 $network_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-                $plugins = array_merge( $plugins, $network_plugins );
+                $plugins = array_merge( $plugins, array_keys( $network_plugins ) );
         }
 
         if ( empty( $plugins ) )

wp-admin/plugins.php

@@ -477 +477 @@
         }
         foreach ( (array)$plugins as $plugin_file => $plugin_data) {
                 $actions = array();
-                $is_active = is_plugin_active($plugin_file);
                 $is_active_for_network = is_plugin_active_for_network($plugin_file);
+                $is_active = $is_active_for_network || is_plugin_active( $plugin_file );
 
                 if ( $is_active_for_network && !is_super_admin() )
                         continue;