Ticket #16357: garyc40.16356.diff

wp-admin/edit-tags.php

@@ -13 +13 @@
         wp_die( __( 'Cheatin’ uh?' ) );
 
 $wp_list_table = _get_list_table('WP_Terms_List_Table');
+$pagenum = $wp_list_table->get_pagenum();
 
 $title = $tax->labels->name;
 
@@ -148 +149 @@
 break;
 
 default:
-
 if ( ! empty($_REQUEST['_wp_http_referer']) ) {
-         wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
-         exit;
+        $location = remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) );
+
+        if ( ! empty( $_REQUEST['paged'] ) )
+                $location = add_query_arg( 'paged', $_REQUEST['paged'] );
+        
+        wp_redirect( $location );
+        exit;
 }
 
 $wp_list_table->prepare_items();
+$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+
+if ( $pagenum > $total_pages ) {
+        wp_redirect( add_query_arg( 'paged', $total_pages ) );
+        exit;
+}
 
 wp_enqueue_script('admin-tags');
 if ( current_user_can($tax->cap->edit_terms) )

wp-admin/network/edit.php

@@ -427 +427 @@
 
                         wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $userfunction ), wp_get_referer() ) );
                 } else {
-                        wp_redirect( network_admin_url( 'users.php' ) );
+                        $location = network_admin_url( 'users.php' );
+
+                        if ( ! empty( $_REQUEST['paged'] ) )
+                                $location = add_query_arg( 'paged', $_REQUEST['paged'], $location );
+                        wp_redirect( $location );
                 }
                 exit();
         break;

wp-admin/network/users.php

@@ -17 +17 @@
         wp_die( __( 'You do not have permission to access this page.' ) );
 
 $wp_list_table = _get_list_table('WP_MS_Users_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 ) {
+        wp_redirect( add_query_arg( 'paged', $total_pages ) );
+        exit;
+}
 $title = __( 'Users' );
 $parent_file = 'users.php';
 

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';
 
@@ -290 +290 @@
         }
 
         $wp_list_table->prepare_items();
-
+        $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+        if ( $pagenum > $total_pages ) {
+                wp_redirect( add_query_arg( 'paged', $total_pages ) );
+                exit;
+        }
         include('./admin-header.php');
 
         $messages = array();

wp-includes/user.php

@@ -542 +542 @@
          */
         function query() {
                 global $wpdb;
-
+                
                 if ( is_array( $this->query_vars['fields'] ) || 'all' == $this->query_vars['fields'] ) {
                         $this->results = $wpdb->get_results("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
                 } else {
                         $this->results = $wpdb->get_col("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
                 }
+                
+                if ( $this->query_vars['count_total'] )
+                        $this->total_users = $wpdb->get_var("SELECT COUNT(*) $this->query_from $this->query_where");
 
                 if ( !$this->results )
                         return;
 
-                if ( $this->query_vars['count_total'] )
-                        $this->total_users = $wpdb->get_var("SELECT COUNT(*) $this->query_from $this->query_where");
-
                 if ( 'all_with_meta' == $this->query_vars['fields'] ) {
                         cache_users( $this->results );