Ticket #20104: 20104.3.diff

src/wp-admin/css/list-tables.css

@@ -869 +869 @@
         padding: 2px 0 0;
 }
 
+.row-actions .network_active {
+        color: #000;
+}
+
 tr:hover .row-actions,
 .mobile .row-actions,
 .row-actions.visible,

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

@@ -127 +127 @@
                         }
                 }
 
+                if ( ! $screen->in_admin( 'network' ) ) {
+                        $show = current_user_can( 'manage_network_plugins' );
+                        /**
+                         * Filter whether to display network-activated plugins alongside site-activated plugins.
+                         *
+                         * @since 4.4.0
+                         *
+                         * @param bool $show Whether to show network-active plugins. Default is whether the current
+                         *                   user can manage network plugins (ie. a Super Admin).
+                         */
+                        $show_network_active = apply_filters( 'show_network_active_plugins', $show );
+                }
+
                 set_transient( 'plugin_slugs', array_keys( $plugins['all'] ), DAY_IN_SECONDS );
 
                 if ( $screen->in_admin( 'network' ) ) {
@@ -171 +184 @@
                                 // 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 ] );
+                                if ( $show_network_active ) {
+                                        // On the non-network screen, show network-activated plugins if allowed
+                                        $plugins['active'][ $plugin_file ] = $plugin_data;
+                                } else {
+                                        // 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
@@ -492 +510 @@
                         else
                                 $is_active = is_plugin_active( $plugin_file );
 
+                        $is_network_active = is_plugin_active_for_network( $plugin_file );
+
                         if ( $screen->in_admin( 'network' ) ) {
                                 if ( $is_active ) {
                                         if ( current_user_can( 'manage_network_plugins' ) ) {
@@ -509 +529 @@
                                         }
                                 }
                         } else {
-                                if ( $is_active ) {
+                                if ( $is_network_active ) {
+                                        $actions = array(
+                                                'network_active' => __( 'Network Active' ),
+                                        );
+                                } elseif ( $is_active ) {
                                         /* translators: %s: plugin name */
                                         $actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( __( 'Deactivate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
                                 } else {
@@ -582 +606 @@
 
                 $class = $is_active ? 'active' : 'inactive';
                 $checkbox_id =  "checkbox_" . md5($plugin_data['Name']);
-                if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+                if ( $is_network_active || in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
                         $checkbox = '';
                 } else {
                         $checkbox = "<label class='screen-reader-text' for='" . $checkbox_id . "' >" . sprintf( __( 'Select %s' ), $plugin_data['Name'] ) . "</label>"