Ticket #18724: 18724.diff

src/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -273 +273 @@
                         return;
                 }
 
-                if ( 'top' ==  $which ) { ?>
+                if ( 'top' ==  $which ) {
+                        wp_nonce_field( 'bulk-' . $this->_args['plural'] ); ?>
                         <div class="tablenav top">
                                 <div class="alignleft actions">
                                         <?php

src/wp-admin/includes/plugin-install.php

@@ -237 +237 @@
 
         if ( current_filter() == 'install_plugins_favorites' && empty( $_GET['user'] ) && ! get_user_option( 'wporg_favorites' ) )
                         return;
-
+?>
+<form id="plugin-filter" action="" method="post">
+<?php
         $wp_list_table->display();
-}
+?>
+</form>
+<?php }
 add_action( 'install_plugins_search',    'display_plugins_table' );
 add_action( 'install_plugins_popular',   'display_plugins_table' );
 add_action( 'install_plugins_new',       'display_plugins_table' );

src/wp-admin/plugin-install.php

@@ -24 +24 @@
 
 $wp_list_table = _get_list_table('WP_Plugin_Install_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
+
+if ( ! empty($_REQUEST['_wp_http_referer']) ) {
+        $location = remove_query_arg( array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']) );
+        
+        if ( ! empty( $_REQUEST['paged'] ) )
+                $location = add_query_arg( 'paged', (int) $_REQUEST['paged'] );
+
+        wp_redirect( $location );
+        exit;
+}
+
 $wp_list_table->prepare_items();
 
 $title = __( 'Add Plugins' );