Ticket #30976: first_pass.30976.diff

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

@@ -387 +387 @@
                 list( $plugin_file, $plugin_data ) = $item;
                 $context = $status;
                 $screen = $this->screen;
+                $is_checked = isset( $_GET['checked'] ) && in_array( $plugin_file, $_GET['checked'] ) ? true : false;
 
                 // Pre-order.
                 $actions = array(
@@ -504 +505 @@
                         $checkbox = '';
                 } else {
                         $checkbox = "<label class='screen-reader-text' for='" . $checkbox_id . "' >" . sprintf( __( 'Select %s' ), $plugin_data['Name'] ) . "</label>"
-                                . "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' />";
+                                . "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "'"
+                                . ( $is_checked ? " checked='checked'" : "" )
+                                . " id='" . $checkbox_id . "' />";
                 }
                 if ( 'dropins' != $context ) {
                         $description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;' ) . '</p>';

wp-admin/plugins.php

@@ -99 +99 @@
                                 update_option( 'recently_activated', $recent );
                         }
 
-                        wp_redirect( self_admin_url("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s") );
+                        $post_activation_url = self_admin_url( "plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s" );
+                        foreach ( $plugins as $checked_plugin ) {
+                                $post_activation_url = add_query_arg( 'checked[]', $checked_plugin, $post_activation_url );
+                        }
+                        wp_redirect( $post_activation_url );
                         exit;
 
                 case 'update-selected' :
@@ -203 +207 @@
                                 update_option( 'recently_activated', $deactivated + (array) get_option( 'recently_activated' ) );
                         }
 
-                        wp_redirect( self_admin_url("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s") );
+                        $post_deactivation_url = self_admin_url( "plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s" );
+                        foreach ( $plugins as $checked_plugin ) {
+                                $post_deactivation_url = add_query_arg( 'checked[]', $checked_plugin, $post_deactivation_url );
+                        }
+                        wp_redirect( $post_deactivation_url );
                         exit;
 
                 case 'delete-selected':