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:
parent
c1cc548f5a
commit
f3dee51a99
|
@ -3306,7 +3306,8 @@ class WP_Plugins_Table extends WP_List_Table {
|
||||||
continue;
|
continue;
|
||||||
} elseif ( is_multisite() && is_network_only_plugin( $plugin_file ) && !current_user_can( 'manage_network_plugins' ) ) {
|
} elseif ( is_multisite() && is_network_only_plugin( $plugin_file ) && !current_user_can( 'manage_network_plugins' ) ) {
|
||||||
$plugins['network'][ $plugin_file ] = $plugin_data;
|
$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;
|
$plugins['active'][ $plugin_file ] = $plugin_data;
|
||||||
} else {
|
} else {
|
||||||
if ( !is_network_admin() && isset( $recently_activated[ $plugin_file ] ) ) // Was the plugin recently activated?
|
if ( !is_network_admin() && isset( $recently_activated[ $plugin_file ] ) ) // Was the plugin recently activated?
|
||||||
|
|
Loading…
Reference in New Issue