From 5382542c1a7b714a7e8b3f81ca940570eb74d461 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Wed, 20 Oct 2010 16:09:55 +0000 Subject: [PATCH] Add some more network admin logic to the plugins list table. fixes #15166. git-svn-id: https://develop.svn.wordpress.org/trunk@15870 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/default-list-tables.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/default-list-tables.php b/wp-admin/includes/default-list-tables.php index 569e793bb8..64e88c5f85 100644 --- a/wp-admin/includes/default-list-tables.php +++ b/wp-admin/includes/default-list-tables.php @@ -3306,7 +3306,8 @@ class WP_Plugins_Table extends WP_List_Table { continue; } elseif ( is_multisite() && is_network_only_plugin( $plugin_file ) && !current_user_can( 'manage_network_plugins' ) ) { $plugins['network'][ $plugin_file ] = $plugin_data; - } elseif ( is_plugin_active( $plugin_file ) ) { + } elseif ( ( !is_network_admin() && is_plugin_active( $plugin_file ) ) + || ( is_network_admin() && is_plugin_active_for_network( $plugin_file ) ) ) { $plugins['active'][ $plugin_file ] = $plugin_data; } else { if ( !is_network_admin() && isset( $recently_activated[ $plugin_file ] ) ) // Was the plugin recently activated?