Ticket #27188: plugin.php.move-deactivated_plugin.patch

wp-admin/includes/plugin.php

@@ -670 +670 @@
                          */
                         do_action( 'deactivate_' . $plugin, $network_deactivating );
 
-                        /**
-                         * Fires for each plugin being deactivated in deactivate_plugins(), after deactivation
-                         * and when the $silent parameter is false.
-                         *
-                         * @since 2.9.0
-                         *
-                         * @param string $plugin               Plugin path to main plugin file with plugin data.
-                         * @param bool   $network_deactivating Whether the plugin is deactivated for all sites in the network
-                         *                                     or just the current site. Multisite only. Default is false.
-                         */
-                        do_action( 'deactivated_plugin', $plugin, $network_deactivating );
                 }
         }
 
@@ -688 +677 @@
                 update_option('active_plugins', $current);
         if ( $do_network )
                 update_site_option( 'active_sitewide_plugins', $network_current );
+        
+        if ( ! $silent ) {
+                /**
+                 * Fires for each plugin being deactivated in deactivate_plugins(), after deactivation
+                 * and when the $silent parameter is false.
+                 *
+                 * @since 2.9.0
+                 *
+                 * @param string $plugin               Plugin path to main plugin file with plugin data.
+                 * @param bool   $network_deactivating Whether the plugin is deactivated for all sites in the network
+                 *                                     or just the current site. Multisite only. Default is false.
+                 */
+                do_action( 'deactivated_plugin', $plugin, $network_deactivating );
+        }
 }
 
 /**