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

Timestamp:

04/19/2012 03:41:29 AM (14 years ago)

Author:

nacin

Message:

Clean up plugins.php with regards to recently edited files, deactivations, and the network admin. see #20468, #20104.

• Limit recently_activated to the site dashboard, and properly remove bulk-activated plugins from the array.
• Remove code used from before the network admin, such as the unused 'network' plugin_status.
• Don't try to deactivate a plugin already deactivated.
• Use more specific caps (manage_network_plugins) rather than is_super_admin().

File:

• trunk/wp-admin/includes/class-wp-plugins-list-table.php (modified) (7 diffs)

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

@@ -14 +14 @@
 
         $status = 'all';
-        if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'network', 'mustuse', 'dropins', 'search' ) ) )
+        if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) )
             $status = $_REQUEST['plugin_status'];
 
@@ -79 +79 @@
         set_transient( 'plugin_slugs', array_keys( $plugins['all'] ), 86400 );
 
-        $recently_activated = get_option( 'recently_activated', array() );
-
-        $one_week = 7*24*60*60;
-        foreach ( $recently_activated as $key => $time )
-            if ( $time + $one_week < time() )
-                unset( $recently_activated[$key] );
-        update_option( 'recently_activated', $recently_activated );
+        if ( ! $screen->is_network ) {
+            $recently_activated = get_option( 'recently_activated', array() );
+
+            $one_week = 7*24*60*60;
+            foreach ( $recently_activated as $key => $time )
+                if ( $time + $one_week < time() )
+                    unset( $recently_activated[$key] );
+            update_option( 'recently_activated', $recently_activated );
+        }
 
         foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
             // Filter into individual sections
-            if ( is_multisite() && is_network_only_plugin( $plugin_file ) && !$screen->is_network ) {
-                unset( $plugins['all'][ $plugin_file] );
-            } elseif ( is_plugin_active_for_network($plugin_file) && !$screen->is_network ) {
+            if ( ! $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) {
                 unset( $plugins['all'][ $plugin_file ] );
-            } elseif ( is_multisite() && is_network_only_plugin( $plugin_file ) && !current_user_can( 'manage_network_plugins' ) ) {
-                $plugins['network'][ $plugin_file ] = $plugin_data;
-            } elseif ( ( !$screen->is_network && is_plugin_active( $plugin_file ) )
+            } elseif ( ( ! $screen->is_network && is_plugin_active( $plugin_file ) )
                 || ( $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) ) {
                 $plugins['active'][ $plugin_file ] = $plugin_data;
@@ -216 +214 @@
                     $text = _n( 'Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count );
                     break;
-                case 'network':
-                    $text = _n( 'Network <span class="count">(%s)</span>', 'Network <span class="count">(%s)</span>', $count );
-                    break;
                 case 'mustuse':
                     $text = _n( 'Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', $count );
@@ -249 +244 @@
         $screen = get_current_screen();
 
-        if ( 'active' != $status ) {
-            $action = $screen->is_network ? 'network-activate-selected' : 'activate-selected';
-            $actions[ $action ] = $screen->is_network ? __( 'Network Activate' ) : __( 'Activate' );
-        }
+        if ( 'active' != $status )
+            $actions['activate-selected'] = $screen->is_network ? __( 'Network Activate' ) : __( 'Activate' );
 
         if ( 'inactive' != $status && 'recent' != $status )
@@ -284 +277 @@
         echo '<div class="alignleft actions">';
 
-        if ( 'recently_activated' == $status )
+        $screen = get_current_screen();
+
+        if ( ! $screen->is_network && 'recently_activated' == $status )
             submit_button( __( 'Clear List' ), 'secondary', 'clear-recent-list', false );
         elseif ( 'top' == $which && 'mustuse' == $status )
@@ -322 +317 @@
         // preorder
         $actions = array(
-            'network_deactivate' => '', 'deactivate' => '',
-            'network_only' => '', 'activate' => '',
-            'network_activate' => '',
+            'deactivate' => '',
+            'activate' => '',
             'edit' => '',
             'delete' => '',
@@ -349 +343 @@
                 $description .= '<p>' . $plugin_data['Description'] . '</p>';
         } else {
-            $is_active_for_network = is_plugin_active_for_network($plugin_file);
             if ( $screen->is_network )
-                $is_active = $is_active_for_network;
+                $is_active = is_plugin_active_for_network( $plugin_file );
             else
                 $is_active = is_plugin_active( $plugin_file );
 
-            if ( $is_active_for_network && !is_super_admin() && !$screen->is_network )
-                return;
-
             if ( $screen->is_network ) {
-                if ( $is_active_for_network ) {
+                if ( $is_active ) {
                     if ( current_user_can( 'manage_network_plugins' ) )
-                        $actions['network_deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Network Deactivate') . '</a>';
+                        $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) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Network Deactivate') . '</a>';
                 } else {
                     if ( current_user_can( 'manage_network_plugins' ) )
-                        $actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
+                        $actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
                     if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) )
                         $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';