Changeset 27326 for trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

Timestamp:

02/28/2014 08:21:52 PM (11 years ago)

Author:

johnbillion

Message:

Don't filter out network-only plugins from the Plugins screen if they're individually active on the current site. Add some code comments for clarity. Props mordauk

File:

• trunk/src/wp-admin/includes/class-wp-plugins-list-table.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -84 +84 @@
         foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
             // Filter into individual sections
-            if ( is_multisite() && ! $screen->in_admin( 'network' ) && is_network_only_plugin( $plugin_file ) ) {
+            if ( is_multisite() && ! $screen->in_admin( 'network' ) && is_network_only_plugin( $plugin_file ) && ! is_plugin_active( $plugin_file ) ) {
+                // On the non-network screen, filter out network-only plugins as long as they're not individually activated
                 unset( $plugins['all'][ $plugin_file ] );
             } elseif ( ! $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) {
+                // On the non-network screen, filter out network activated plugins
                 unset( $plugins['all'][ $plugin_file ] );
             } elseif ( ( ! $screen->in_admin( 'network' ) && is_plugin_active( $plugin_file ) )
                 || ( $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) ) {
+                // On the non-network screen, populate the active list with plugins that are individually activated
+                // On the network-admin screen, populate the active list with plugins that are network activated
                 $plugins['active'][ $plugin_file ] = $plugin_data;
             } else {
-                if ( ! $screen->in_admin( 'network' ) && isset( $recently_activated[ $plugin_file ] ) ) // Was the plugin recently activated?
+                if ( ! $screen->in_admin( 'network' ) && isset( $recently_activated[ $plugin_file ] ) ) {
+                    // On the non-network screen, populate the recently activated list with plugins that have been recently activated
                     $plugins['recently_activated'][ $plugin_file ] = $plugin_data;
+                }
+                // Populate the inactive list with plugins that aren't activated
                 $plugins['inactive'][ $plugin_file ] = $plugin_data;
             }