Ticket #16187: 16187-3.diff

wp-admin/plugin-install.php

@@ -21 +21 @@
 }
 
 $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/network/themes.php

@@ -22 +22 @@
         wp_die( __( 'You do not have sufficient permissions to manage network themes.' ) );
 
 $wp_list_table = get_list_table('WP_MS_Themes_List_Table');
+$pagenum = $wp_list_table->get_pagenum();
 
 $action = $wp_list_table->current_action();
 
@@ -169 +170 @@
 }
 
 $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/network/sites.php

@@ -17 +17 @@
         wp_die( __( 'You do not have permission to access this page.' ) );
 
 $wp_list_table = get_list_table('WP_MS_Sites_List_Table');
+$pagenum = $wp_list_table->get_pagenum();
 
 $title = __( 'Sites' );
 $parent_file = 'sites.php';
@@ -87 +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/plugins.php

@@ -20 +20 @@
         wp_die( __( 'You do not have sufficient permissions to manage plugins for this site.' ) );
 
 $wp_list_table = get_list_table('WP_Plugins_List_Table');
+$pagenum = $wp_list_table->get_pagenum();
 
 $action = $wp_list_table->current_action();
 
@@ -315 +316 @@
 
 $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

@@ -21 +21 @@
 }
 
 $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';