Changeset 16011

Timestamp:

10/27/2010 01:20:53 PM (14 years ago)

Author:

scribu

Message:

Pass $network_wide flag to de/activation hooks. See #14170

File:

• trunk/wp-admin/includes/plugin.php (modified) (5 diffs)

trunk/wp-admin/includes/plugin.php

@@ -465 +465 @@
  */
 function activate_plugin( $plugin, $redirect = '', $network_wide = false) {
-    $plugin  = plugin_basename( trim( $plugin ) );
+    $plugin = plugin_basename( trim( $plugin ) );
 
     if ( is_multisite() && ( $network_wide || is_network_only_plugin($plugin) ) ) {
@@ -483 +483 @@
         ob_start();
         include(WP_PLUGIN_DIR . '/' . $plugin);
-        do_action( 'activate_plugin', trim( $plugin) );
-        do_action( 'activate_' . trim( $plugin ) );
+        do_action( 'activate_plugin', $plugin, $network_wide );
+        do_action( 'activate_' . $plugin, $network_wide );
         if ( $network_wide ) {
             $current[$plugin] = time();
@@ -493 +493 @@
             update_option('active_plugins', $current);
         }
-        do_action( 'activated_plugin', trim( $plugin) );
+        do_action( 'activated_plugin', $plugin, $network_wide );
         if ( ob_get_length() > 0 ) {
             $output = ob_get_clean();
@@ -522 +522 @@
 
     foreach ( (array) $plugins as $plugin ) {
-        $plugin = plugin_basename($plugin);
+        $plugin = plugin_basename( trim( $plugin ) );
         if ( ! is_plugin_active($plugin) )
             continue;
+
+        $network_wide = is_plugin_active_for_network( $plugin );
+
         if ( ! $silent )
-            do_action( 'deactivate_plugin', trim( $plugin ) );
-
-        if ( is_plugin_active_for_network($plugin) ) {
-            // Deactivate network wide
+            do_action( 'deactivate_plugin', $plugin, $network_wide );
+
+        if ( $network_wide ) {
             $do_network = true;
             unset( $network_current[ $plugin ] );
         } else {
-            // Deactivate for this blog only
-            $key = array_search( $plugin, (array) $current );
+            $key = array_search( $plugin, $current );
             if ( false !== $key ) {
                 $do_blog = true;
@@ -541 +542 @@
         }
 
-        //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_' . $plugin, $network_wide );
+            do_action( 'deactivated_plugin', $plugin, $network_wide );
         }
     }