Changeset 27413

Timestamp:

03/05/2014 06:25:20 PM (11 years ago)

Author:

johnbillion

Message:

Fix bulk activation of network-only plugins. Fixes #26487. Props dd32.

File:

• trunk/src/wp-admin/plugins.php (modified) (1 diff)

trunk/src/wp-admin/plugins.php

@@ -70 +70 @@
             $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
 
-            // Only activate plugins which are not already active.
             if ( is_network_admin() ) {
                 foreach ( $plugins as $i => $plugin ) {
-                    if ( is_plugin_active_for_network( $plugin ) )
+                    // Only activate plugins which are not already network activated.
+                    if ( is_plugin_active_for_network( $plugin ) ) {
                         unset( $plugins[ $i ] );
+                    }
                 }
             } else {
                 foreach ( $plugins as $i => $plugin ) {
-                    if ( is_plugin_active( $plugin ) || is_network_only_plugin( $plugin ) )
+                    // Only activate plugins which are not already active and are not network-only when on Multisite.
+                    if ( is_plugin_active( $plugin ) || ( is_multisite() && is_network_only_plugin( $plugin ) ) ) {
                         unset( $plugins[ $i ] );
+                    }
                 }
             }