Index: wp-admin/includes/class-wp-list-table.php
===================================================================
--- wp-admin/includes/class-wp-list-table.php (revision 18144)
+++ wp-admin/includes/class-wp-list-table.php (working copy)
@@ -441,7 +441,10 @@
* @return int
*/
function get_pagenum() {
- $pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0;
+ if ( isset( $_REQUEST['search-paged'] ) && isset( $_REQUEST['paged'] ) && isset( $_REQUEST['s'] ) )
+ $pagenum = 1;
+ else
+ $pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0;
if( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )
$pagenum = $this->_pagination_args['total_pages'];
@@ -507,18 +510,25 @@
'‹'
);
- if ( 'bottom' == $which )
+ if ( 'bottom' == $which ) {
$html_current_page = $current;
- else
+ } else {
+ if ( isset( $_GET['s'] ) )
+ $field_name = esc_attr( 'search-paged' );
+ else
+ $field_name = esc_attr( 'paged' );
$html_current_page = sprintf( "",
esc_attr__( 'Current page' ),
- esc_attr( 'paged' ),
+ $field_name,
$current,
strlen( $total_pages )
);
+ }
$html_total_pages = sprintf( "%s", number_format_i18n( $total_pages ) );
$page_links[] = '' . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . '';
+
+ $current_url = remove_query_arg( 'search-paged', $current_url );
$page_links[] = sprintf( "%s",
'next-page' . $disable_last,