Ticket #16208: 16208.patch

wp-admin/edit-comments.php

@@ -101 +101 @@
 
 $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;
-}
-
 wp_enqueue_script('admin-comments');
 enqueue_comment_hotkeys_js();
 

wp-admin/edit.php

@@ -142 +142 @@
 
 $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;
-}
-
 wp_enqueue_script('inline-edit-post');
 
 $title = $post_type_object->labels->name;

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

@@ -138 +138 @@
 
                 if ( !$args['total_pages'] && $args['per_page'] > 0 )
                         $args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
-
+
+                // redirect if page number is invalid and headers are not already sent
+                if ( ! headers_sent() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
+                        wp_redirect( add_query_arg( 'paged', $args['total_pages'] ) );
+                        exit;
+                }
+
                 $this->_pagination_args = $args;
         }
 

wp-admin/network/sites.php

@@ -88 +88 @@
 
 $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;
-}
-
 require_once( '../admin-header.php' );
 ?>
 

wp-admin/network/themes.php

@@ -171 +171 @@
 
 $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;
-}
-
 add_thickbox();
 
 add_screen_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' )) );

wp-admin/plugin-install.php

@@ -23 +23 @@
 $wp_list_table = _get_list_table('WP_Plugin_Install_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
 $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 = __('Install Plugins');
 $parent_file = 'plugins.php';

wp-admin/plugins.php

@@ -313 +313 @@
 
 $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;
-}
-
 wp_enqueue_script('plugin-install');
 add_thickbox();
 

wp-admin/theme-install.php

@@ -23 +23 @@
 $wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
 $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 = __('Install Themes');
 $parent_file = 'themes.php';

wp-admin/upload.php

@@ -130 +130 @@
 
 $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 = __('Media Library');
 $parent_file = 'upload.php';