Changeset 20555

Timestamp:

04/21/2012 12:45:53 AM (12 years ago)

Author:

nacin

Message:

Correct logic in deactivate_plugins() where network_wide = null. props SergeyBiryukov. fixes #20497.

File:

• trunk/wp-admin/includes/plugin.php (modified) (1 diff)

trunk/wp-admin/includes/plugin.php

@@ -594 +594 @@
 
         if ( false !== $network_wide ) {
-            if ( ! is_plugin_active_for_network( $plugin ) )
+            if ( is_plugin_active_for_network( $plugin ) ) {
+                $do_network = true;
+                unset( $network_current[ $plugin ] );
+            } elseif ( $network_wide ) {
                 continue;
-            $do_network = true;
-            unset( $network_current[ $plugin ] );
+            }
         }