WordPress.org

Make WordPress Core

Changeset 16498


Ignore:
Timestamp:
11/20/10 01:23:44 (3 years ago)
Author:
nacin
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/class-wp-plugins-list-table.php

    r16438 r16498  
    8585        foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) { 
    8686            // Filter into individual sections 
    87             if ( is_plugin_active_for_network($plugin_file) && !$screen->is_network ) { 
     87            if ( is_multisite() && is_network_only_plugin( $plugin_file ) && !$screen->is_network ) { 
     88                unset( $plugins['all'][ $plugin_file] ); 
     89            } elseif ( is_plugin_active_for_network($plugin_file) && !$screen->is_network ) { 
    8890                unset( $plugins['all'][ $plugin_file ] ); 
    89                 continue; 
    9091            } elseif ( is_multisite() && is_network_only_plugin( $plugin_file ) && !current_user_can( 'manage_network_plugins' ) ) { 
    9192                $plugins['network'][ $plugin_file ] = $plugin_data; 
Note: See TracChangeset for help on using the changeset viewer.