Ticket #16356: 16356.patch

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

@@ -42 +42 @@
                 $per_page = ( $this->is_site_users ) ? 'site_users_network_per_page' : 'users_per_page';
                 $users_per_page = $this->get_items_per_page( $per_page );
 
-                $paged = $this->get_pagenum();
+                $users_of_blog = count_users();
+                $total_pages = ceil( $users_of_blog['total_users'] / $users_per_page );
 
+                $paged = min( $total_pages, $this->get_pagenum() );
+
                 $args = array(
                         'number' => $users_per_page,
                         'offset' => ( $paged-1 ) * $users_per_page,

wp-admin/users.php

@@ -13 +13 @@
         wp_die( __( 'Cheatin’ uh?' ) );
 
 $wp_list_table = _get_list_table('WP_Users_List_Table');
+$pagenum = $wp_list_table->get_pagenum();
 
 $title = __('Users');
 $parent_file = 'users.php';
@@ -291 +292 @@
 
         $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;
+        }
+
         include('./admin-header.php');
 
         $messages = array();