Changeset 20526

Timestamp:

04/19/2012 03:43:56 AM (14 years ago)

Author:

nacin

Message:

Do not deactivate plugins which are already deactivated.

File:

• branches/3.3/wp-admin/plugins.php (modified) (2 diffs)

branches/3.3/wp-admin/plugins.php

@@ -155 +155 @@
 
                         check_admin_referer('deactivate-plugin_' . $plugin);
+                        if ( ! is_network_admin() && is_plugin_active_for_network() ) {
+                                wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+                                exit;
+                        }
                         deactivate_plugins($plugin);
                         update_option('recently_activated', array($plugin => time()) + (array)get_option('recently_activated'));
@@ -170 +174 @@
 
                         $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
-                        $plugins = array_filter($plugins, 'is_plugin_active'); //Do not deactivate plugins which are already deactivated.
+                        // Do not deactivate plugins which are already deactivated.
+                        if ( is_network_admin() ) {
+                                $plugins = array_filter( $plugins, 'is_plugin_active_for_network' );
+                        } else {
+                                $plugins = array_filter( $plugins, 'is_plugin_active' );
+                                $plugins = array_diff( $plugins, array_filter( $plugins, 'is_plugin_active_for_network' ) );
+                        }
                         if ( empty($plugins) ) {
                                 wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );