Ticket #16357: garyc40.16356.2.diff

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-tags.php

@@ -148 +148 @@
 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();

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'] );
-
+                
+                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;
         }
 
@@ -443 +448 @@
         function get_pagenum() {
                 $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'];
-
                 return max( 1, $pagenum );
         }
 

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/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';
@@ -88 +87 @@
 
 $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

@@ -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();
 
@@ -171 +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/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');
+
 $wp_list_table->prepare_items();
 
 $title = __( 'Users' );

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/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();
 
@@ -316 +315 @@
 
 $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';

wp-admin/upload.php

@@ -13 +13 @@
         wp_die( __( 'You do not have permission to upload files.' ) );
 
 $wp_list_table = _get_list_table('WP_Media_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
 
 // Handle bulk actions
 $doaction = $wp_list_table->current_action();
@@ -130 +129 @@
 
 $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';
 

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 );