WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add some more network admin logic to the plugins list table. fixes #15166. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15870 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-10-20 16:09:55 +00:00
parent c1cc548f5a
commit f3dee51a99
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/default-list-tables.php
View File

@ -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?