Ticket #20497: 20497.patch

wp-admin/includes/plugin.php

@@ -593 +593 @@
                         do_action( 'deactivate_plugin', $plugin, $network_deactivating );
 
                 if ( false !== $network_wide ) {
-                        if ( ! is_plugin_active_for_network( $plugin ) )
+                        if ( is_plugin_active_for_network( $plugin ) ) {
+                                $do_network = true;
+                                unset( $network_current[ $plugin ] );
+                        } elseif ( $network_wide ) {
                                 continue;
-                        $do_network = true;
-                        unset( $network_current[ $plugin ] );
+                        }
                 }
 
                 if ( true !== $network_wide ) {