Changeset 17900

Timestamp:

05/12/2011 06:09:42 AM (14 years ago)

Author:

markjaquith

Message:

Centralize pagination bound exceeding redirects for list tables. props garyc40. props johnjamesjacoby. fixes #16208

Location:

trunk/wp-admin

Files:

• edit-comments.php (modified) (1 diff)
• edit.php (modified) (1 diff)
• includes/class-wp-list-table.php (modified) (1 diff)
• network/sites.php (modified) (1 diff)
• network/themes.php (modified) (1 diff)
• plugin-install.php (modified) (1 diff)
• plugins.php (modified) (1 diff)
• theme-install.php (modified) (1 diff)
• upload.php (modified) (1 diff)

trunk/wp-admin/edit-comments.php

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

trunk/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');

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

@@ -139 +139 @@
         if ( !$args['total_pages'] && $args['per_page'] > 0 )
             $args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+
+        // redirect if page number is invalid and headers are not already sent
+        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;

trunk/wp-admin/network/sites.php

@@ -89 +89 @@
 $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' );
 ?>

trunk/wp-admin/network/themes.php

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

trunk/wp-admin/plugin-install.php

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

trunk/wp-admin/plugins.php

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

trunk/wp-admin/theme-install.php

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

trunk/wp-admin/upload.php

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