Ticket #14170: deactivate_plugins.diff

wp-admin/includes/plugin.php

@@ -512 +512 @@
  * @since unknown
  *
  * @param string|array $plugins Single plugin or list of plugins to deactivate.
- * @param bool $silent Optional, default is false. Prevent calling deactivate hook.
+ * @param bool $silent Optional, default is false. Prevent calling deactivate hook. 
+ *  Used by the updater to internally deactivate plugins, but not notifying them
+ *  of the fact, to prevent unexpected output.
  */
 function deactivate_plugins( $plugins, $silent = false ) {
         $network_current = get_site_option( 'active_sitewide_plugins', array() );
@@ -539 +541 @@
                         }
                 }
 
-                //Used by Plugin updater to internally deactivate plugin, however, not to notify plugins of the fact to prevent plugin output.
-                if ( ! $silent ) {
+                // Don't trigger if the plugin will still be active on the current blog
+                if ( !$silent && !( $do_network && in_array( $plugin, $current ) ) ) {
                         do_action( 'deactivate_' . trim( $plugin ) );
                         do_action( 'deactivated_plugin', trim( $plugin ) );
                 }