Ticket #30976: 30976.diff

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

@@ -493 +493 @@
                 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(
@@ -665 +666 @@
                 if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
                         $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 . "' />";
+                        $checkbox = sprintf(
+                                '<label class="screen-reader-text" for="%s">%s</label>',
+                                $checkbox_id,
+                                sprintf( __( 'Select %s' ), $plugin_data['Name'] )
+                        );
+                        $checkbox .= sprintf(
+                                '<input type="checkbox" name="checked[]" value="%s" id="%s" %s />',
+                                esc_attr( $plugin_file ),
+                                $checkbox_id,
+                                checked( $is_checked, true, false )
+                        );
                 }
                 if ( 'dropins' != $context ) {
                         $description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;' ) . '</p>';

src/wp-admin/plugins.php

@@ -114 +114 @@
                                 update_site_option( 'recently_activated', $recent );
                         }
 
-                        wp_redirect( self_admin_url("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s") );
+                        $post_activation_query_args = array(
+                                'activate-multi' => 'true',
+                                'plugin_status'  => $status,
+                                'paged'          => $page,
+                                's'              => $s,
+                                'checked'        => array(),
+                        );
+
+                        foreach ( $plugins as $checked_plugin ) {
+                                $post_activation_query_args['checked'][] = $checked_plugin;
+                        }
+
+                        wp_redirect( esc_url_raw( add_query_arg( $post_activation_query_args, self_admin_url( 'plugins.php' ) ) ) );
                         exit;
 
                 case 'update-selected' :
@@ -223 +235 @@
                                 update_site_option( 'recently_activated', $deactivated + (array) get_site_option( 'recently_activated' ) );
                         }
 
-                        wp_redirect( self_admin_url("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s") );
+                        $post_deactivation_query_args = array(
+                                'deactivate-multi' => 'true',
+                                'plugin_status'    => $status,
+                                'paged'            => $page,
+                                's'                => $s,
+                                'checked'          => array(),
+                        );
+
+                        foreach ( $plugins as $checked_plugin ) {
+                                $post_deactivation_query_args['checked'][] = $checked_plugin;
+                        }
+
+                        wp_redirect( esc_url_raw( add_query_arg( $post_deactivation_query_args, self_admin_url( 'plugins.php' ) ) ) );
                         exit;
 
                 case 'delete-selected':