Changeset 17361

Timestamp:

01/25/2011 07:20:20 PM (14 years ago)

Author:

ryan

Message:

Pagination fixes. Props garyc40. fixes #16357

Location:

trunk

Files:

• wp-admin/edit-tags.php (modified) (2 diffs)
• wp-admin/network/edit.php (modified) (1 diff)
• wp-admin/network/users.php (modified) (1 diff)
• wp-admin/users.php (modified) (2 diffs)
• wp-includes/user.php (modified) (2 diffs)

trunk/wp-admin/edit-tags.php

@@ -14 +14 @@
 
 $wp_list_table = _get_list_table('WP_Terms_List_Table');
+$pagenum = $wp_list_table->get_pagenum();
 
 $title = $tax->labels->name;
@@ -149 +150 @@
 
 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', (int) $_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');

trunk/wp-admin/network/edit.php

@@ -428 +428 @@
             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', (int) $_REQUEST['paged'], $location );
+            wp_redirect( $location );
         }
         exit();

trunk/wp-admin/network/users.php

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

trunk/wp-admin/users.php

@@ -14 +14 @@
 
 $wp_list_table = _get_list_table('WP_Users_List_Table');
-
+$pagenum = $wp_list_table->get_pagenum();
 $title = __('Users');
 $parent_file = 'users.php';
@@ -291 +291 @@
 
     $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');
 

trunk/wp-includes/user.php

@@ -543 +543 @@
     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");
@@ -549 +549 @@
             $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'] ) {