Ticket #14170: 14170.diff

wp-includes/plugin.php

@@ -605 +605 @@
  */
 function register_activation_hook($file, $function) {
         $file = plugin_basename($file);
-        add_action('activate_' . $file, $function);
+        add_action('activate_' . $file, $function, 10, 2);
 }
 
 /**
@@ -630 +630 @@
  */
 function register_deactivation_hook($file, $function) {
         $file = plugin_basename($file);
-        add_action('deactivate_' . $file, $function);
+        add_action('deactivate_' . $file, $function, 10, 2);
 }
 
 /**

wp-admin/includes/plugin.php

@@ -482 +482 @@
                         wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
                 ob_start();
                 include(WP_PLUGIN_DIR . '/' . $plugin);
-                do_action( 'activate_plugin', trim( $plugin) );
-                do_action( 'activate_' . trim( $plugin ) );
+                do_action( 'activate_plugin', trim( $plugin), $network_wide );
+                do_action( 'activate_' . trim( $plugin ), $network_wide );
                 if ( $network_wide ) {
                         $current[$plugin] = time();
                         update_site_option( 'active_sitewide_plugins', $current );
@@ -492 +492 @@
                         sort($current);
                         update_option('active_plugins', $current);
                 }
-                do_action( 'activated_plugin', trim( $plugin) );
+                do_action( 'activated_plugin', trim( $plugin), $network_wide );
                 if ( ob_get_length() > 0 ) {
                         $output = ob_get_clean();
                         return new WP_Error('unexpected_output', __('The plugin generated unexpected output.'), $output);
@@ -524 +524 @@
                 $plugin = plugin_basename($plugin);
                 if ( ! is_plugin_active($plugin) )
                         continue;
+
+                $network_wide = is_plugin_active_for_network( $plugin );
+
                 if ( ! $silent )
-                        do_action( 'deactivate_plugin', trim( $plugin ) );
+                        do_action( 'deactivate_plugin', trim( $plugin ), $network_wide );
 
-                if ( is_plugin_active_for_network($plugin) ) {
-                        // Deactivate network wide
+                if ( $network_wide ) {
                         $do_network = true;
                         unset( $network_current[ $plugin ] );
                 } else {
-                        // Deactivate for this blog only
                         $key = array_search( $plugin, (array) $current );
                         if ( false !== $key ) {
                                 $do_blog = true;
@@ -540 +541 @@
                         }
                 }
 
-                //Used by Plugin updater to internally deactivate plugin, however, not to notify plugins of the fact to prevent plugin output.
                 if ( ! $silent ) {
-                        do_action( 'deactivate_' . trim( $plugin ) );
-                        do_action( 'deactivated_plugin', trim( $plugin ) );
+                        do_action( 'deactivate_' . trim( $plugin ), $network_wide );
+                        do_action( 'deactivated_plugin', trim( $plugin ), $network_wide );
                 }
         }