From 10f92b7e875260bdd908daafa76382463ab1e3e7 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Sat, 20 Nov 2010 01:23:44 +0000 Subject: [PATCH] Don't include Network Only plugins in the site admin plugin counts. props PeteMall, fixes #15502. git-svn-id: https://develop.svn.wordpress.org/trunk@16498 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/class-wp-plugins-list-table.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php index 8e764d3d95..e102263de4 100644 --- a/wp-admin/includes/class-wp-plugins-list-table.php +++ b/wp-admin/includes/class-wp-plugins-list-table.php @@ -84,9 +84,10 @@ class WP_Plugins_List_Table extends WP_List_Table { 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; } elseif ( ( !$screen->is_network && is_plugin_active( $plugin_file ) )