Changes from trunk/wp-admin/includes/class-wp-plugins-list-table.php at r20853 to branches/3.4/wp-admin/includes/class-wp-plugins-list-table.php at r21741

File:

• branches/3.4/wp-admin/includes/class-wp-plugins-list-table.php (modified) (1 diff)

branches/3.4/wp-admin/includes/class-wp-plugins-list-table.php

@@ -91 +91 @@
         foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
             // Filter into individual sections
-            if ( ! $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) {
+            if ( is_multisite() && ! $screen->is_network && is_network_only_plugin( $plugin_file ) ) {
+                unset( $plugins['all'][ $plugin_file ] );
+            } elseif ( ! $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) {
                 unset( $plugins['all'][ $plugin_file ] );
             } elseif ( ( ! $screen->is_network && is_plugin_active( $plugin_file ) )