Ticket #18503: 18503.patch

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

@@ -10 +10 @@
 class WP_Plugins_List_Table extends WP_List_Table {
 
         function __construct() {
-                global $status, $page;
+                global $status, $page, $checked_plugins;
 
                 $default_status = get_user_option( 'plugins_last_view' );
                 if ( empty( $default_status ) )
@@ -21 +21 @@
                 if ( $status != $default_status && 'search' != $status )
                         update_user_meta( get_current_user_id(), 'plugins_last_view', $status );
 
+                $checked_plugins = isset( $_REQUEST['plugins'] ) ? $_REQUEST['plugins'] : array();
+                if ( !empty( $checked_plugins ) )
+                        $checked_plugins = explode( ',', $checked_plugins );
 
                 if ( isset($_REQUEST['s']) )
                         $_SERVER['REQUEST_URI'] = add_query_arg('s', stripslashes($_REQUEST['s']) );
@@ -318 +321 @@
         }
 
         function single_row( $plugin_file, $plugin_data ) {
-                global $status, $page, $s;
+                global $status, $page, $s, $checked_plugins;
 
                 $context = $status;
 
@@ -393 +396 @@
 
                 $class = $is_active ? 'active' : 'inactive';
                 $checkbox_id =  "checkbox_" . md5($plugin_data['Name']);
-                $checkbox = in_array( $status, array( 'mustuse', 'dropins' ) ) ? '' : "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $plugin_data['Name'] . "</label>";
+                $checkbox = in_array( $status, array( 'mustuse', 'dropins' ) ) ? '' : "<input type='checkbox' name='checked[]'" . checked( in_array( $plugin_file, $checked_plugins ), true, false ) . " value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $plugin_data['Name'] . "</label>";
                 if ( 'dropins' != $context ) {
                         $description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;' ) . '</p>';
                         $plugin_name = $plugin_data['Name'];

wp-admin/plugins.php

@@ -200 +200 @@
 
                         $plugins = array_filter($plugins, 'is_plugin_inactive'); // Do not allow to delete Activated plugins.
                         if ( empty( $plugins ) ) {
-                                wp_redirect( self_admin_url( "plugins.php?error=true&main=true&plugin_status=$status&paged=$page&s=$s" ) );
+                                $checked_plugins = implode( ',', $_REQUEST['checked'] );
+                                wp_redirect( self_admin_url( "plugins.php?error=true&main=true&plugin_status=$status&paged=$page&s=$s&plugins=$checked_plugins" ) );
                                 exit;
                         }