Changeset 20525 for trunk/wp-admin/includes/plugin.php

Timestamp:

04/19/2012 03:41:29 AM (11 years ago)

Author:

nacin

Message:

Clean up plugins.php with regards to recently edited files, deactivations, and the network admin. see #20468, #20104.

• Limit recently_activated to the site dashboard, and properly remove bulk-activated plugins from the array.
• Remove code used from before the network admin, such as the unused 'network' plugin_status.
• Don't try to deactivate a plugin already deactivated.
• Use more specific caps (manage_network_plugins) rather than is_super_admin().

File:

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

trunk/wp-admin/includes/plugin.php

@@ -573 +573 @@
  *
  * @param string|array $plugins Single plugin or list of plugins to deactivate.
+ * @param mixed $network_wide Whether to deactivate the plugin for all sites in the network.
+ *  A value of null (the default) will deactivate plugins for both the site and the network.
  * @param bool $silent Prevent calling deactivation hooks. Default is false.
  */
-function deactivate_plugins( $plugins, $silent = false ) {
+function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
     if ( is_multisite() )
         $network_current = get_site_option( 'active_sitewide_plugins', array() );
@@ -586 +588 @@
             continue;
 
-        $network_wide = is_plugin_active_for_network( $plugin );
+        $network_deactivating = false !== $network_wide && is_plugin_active_for_network( $plugin );
 
         if ( ! $silent )
-            do_action( 'deactivate_plugin', $plugin, $network_wide );
-
-        if ( $network_wide ) {
+            do_action( 'deactivate_plugin', $plugin, $network_deactivating );
+
+        if ( false !== $network_wide ) {
+            if ( ! is_plugin_active_for_network( $plugin ) )
+                continue;
             $do_network = true;
             unset( $network_current[ $plugin ] );
-        } else {
+        }
+
+        if ( true !== $network_wide ) {
             $key = array_search( $plugin, $current );
             if ( false !== $key ) {
@@ -603 +609 @@
 
         if ( ! $silent ) {
-            do_action( 'deactivate_' . $plugin, $network_wide );
-            do_action( 'deactivated_plugin', $plugin, $network_wide );
+            do_action( 'deactivate_' . $plugin, $network_deactivating );
+            do_action( 'deactivated_plugin', $plugin, $network_deactivating );
         }
     }