Changeset 16498

Timestamp:

11/20/2010 01:23:44 AM (14 years ago)

Author:

nacin

Message:

Don't include Network Only plugins in the site admin plugin counts. props PeteMall, fixes #15502.

File:

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

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

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