Changeset 30249

Timestamp:

11/06/2014 07:00:57 AM (11 years ago)

Author:

nacin

Message:

Plugin search: Wrap results in a form to fix pagination's paged input field.

Merges [29829] to the 4.0 branch.

props jesin, ocean90.
fixes #18724.

Location:

branches/4.0

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-plugin-install-list-table.php (modified) (1 diff)
• src/wp-admin/includes/plugin-install.php (modified) (1 diff)
• src/wp-admin/plugin-install.php (modified) (1 diff)

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

@@ -274 +274 @@
         }
 
-        if ( 'top' ==  $which ) { ?>
+        if ( 'top' ==  $which ) {
+            wp_referer_field();
+        ?>
             <div class="tablenav top">
                 <div class="alignleft actions">

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

@@ -236 +236 @@
     global $wp_list_table;
 
-    if ( current_filter() == 'install_plugins_favorites' && empty( $_GET['user'] ) && ! get_user_option( 'wporg_favorites' ) )
-            return;
-
-    $wp_list_table->display();
+    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' );

branches/4.0/src/wp-admin/plugin-install.php

@@ -25 +25 @@
 $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( '_wp_http_referer', wp_unslash( $_SERVER['REQUEST_URI'] ) );
+
+    if ( ! empty( $_REQUEST['paged'] ) ) {
+        $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+    }
+
+    wp_redirect( $location );
+    exit;
+}
+
 $wp_list_table->prepare_items();
+
+$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+
+if ( $pagenum > $total_pages && $total_pages > 0 ) {
+    wp_redirect( add_query_arg( 'paged', $total_pages ) );
+    exit;
+}
 
 $title = __( 'Add Plugins' );