Changeset 16855

Timestamp:

12/10/2010 08:49:16 AM (14 years ago)

Author:

scribu

Message:

Redirect to correct page after bulk action for posts and comments. Props garyc40. Fixes #15416

Location:

trunk/wp-admin

Files:

• edit-comments.php (modified) (3 diffs)
• edit.php (modified) (4 diffs)

trunk/wp-admin/edit-comments.php

@@ -14 +14 @@
 $wp_list_table = get_list_table('WP_Comments_List_Table');
 $wp_list_table->check_permissions();
+$pagenum = $wp_list_table->get_pagenum();
 
 $doaction = $wp_list_table->current_action();
@@ -37 +38 @@
     $approved = $unapproved = $spammed = $unspammed = $trashed = $untrashed = $deleted = 0;
     $redirect_to = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids' ), wp_get_referer() );
+
+    // Fix the problem with wrong page number. This happens when the user use the javascript
+    // pagination feature to navigate to a certain page, then does some bulk actions there,
+    // he will be redirected back to te original page number instead of the navigated one.
+    $redirect_to = add_query_arg( 'paged', $pagenum, $redirect_to );
 
     foreach ( $comment_ids as $comment_id ) { // Check the permissions on each
@@ -100 +106 @@
 $wp_list_table->prepare_items();
 
+// redirect to the last page if the page number is larger than the total number of pages
+// this can happen when all the items in the last page are deleted, for example
+$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

@@ -11 +11 @@
 $wp_list_table = get_list_table('WP_Posts_List_Table');
 $wp_list_table->check_permissions();
+$pagenum = $wp_list_table->get_pagenum();
 
 // Back-compat for viewing comments of an entry
@@ -27 +28 @@
     check_admin_referer('bulk-posts');
     $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
+    
+    // Fix the problem with wrong page number. This happens when the user use the javascript
+    // pagination feature to navigate to a certain page, then does some bulk actions there,
+    // he will be redirected back to te original page number instead of the navigated one.
+    $sendback = add_query_arg( 'paged', $pagenum, $sendback );
 
     if ( strpos($sendback, 'post.php') !== false )
@@ -61 +67 @@
                 $trashed++;
             }
-            $sendback = add_query_arg( array('trashed' => $trashed, 'ids' => join(',', $post_ids)), $sendback );
+            $sendback = add_query_arg( array('trashed' => $trashed, 'ids' => join(',', $post_ids) ), $sendback );
             break;
         case 'untrash':
@@ -127 +133 @@
 
 $wp_list_table->prepare_items();
+
+// redirect to the last page if the page number is larger than the total number of pages
+// this can happen when all the items in the last page are deleted, for example
+$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');