Changeset 16089

Timestamp:

10/29/2010 07:09:04 PM (14 years ago)

Author:

scribu

Message:

Fix bulk actions for Network Admin -> plugins. See #14435

Location:

trunk/wp-admin

Files:

• includes/list-table-plugins.php (modified) (1 diff)
• plugins.php (modified) (1 diff)

trunk/wp-admin/includes/list-table-plugins.php

@@ -254 +254 @@
 
         $actions = array();
-        if ( 'active' != $status )
-            $actions['activate-selected'] = __( 'Activate' );
-        if ( is_multisite() && 'network' != $status )
-            $actions['network-activate-selected'] = __( 'Network Activate' );
+
+        if ( 'active' != $status ) {
+            $action = is_network_admin() ? 'network-activate-selected' : 'activate-selected'; 
+            $actions[ $action ] = __( 'Activate' );
+        }
+
         if ( 'inactive' != $status && 'recent' != $status )
             $actions['deactivate-selected'] = __( 'Deactivate' );
-        if ( current_user_can( 'update_plugins' ) )
-            $actions['update-selected'] = __( 'Update' );
-        if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
-            $actions['delete-selected'] = __( 'Delete' );
-            
-        if ( is_multisite() && !is_network_admin() ) {
-            unset( $actions['network-activate-selected'] );
-            unset( $actions['update-selected'] );
-            unset( $actions['delete-selected'] );
+
+        if ( !is_multisite() || is_network_admin() ) {
+            if ( current_user_can( 'update_plugins' ) )
+                $actions['update-selected'] = __( 'Update' );
+            if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
+                $actions['delete-selected'] = __( 'Delete' );
         }
 

trunk/wp-admin/plugins.php

@@ -64 +64 @@
 
             $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
-            $plugins = array_filter($plugins, create_function('$plugin', 'return !is_plugin_active($plugin);') ); // Only activate plugins which are not already active.
+
+            // Only activate plugins which are not already active.
+            $check = $network_wide ? 'is_plugin_active_for_network' : 'is_plugin_active';
+            foreach ( $plugins as $i => $plugin )
+                if ( $check( $plugin ) )
+                    unset( $plugins[ $i ] );
+
             if ( empty($plugins) ) {
                 wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );