<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16855] trunk/wp-admin:
Redirect to correct page after bulk action for posts and comments.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16855">16855</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-12-10 08:49:16 +0000 (Fri, 10 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Redirect to correct page after bulk action for posts and comments. Props garyc40. Fixes <a href="http://trac.wordpress.org/ticket/15416">#15416</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (16854 => 16855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2010-12-10 08:20:46 UTC (rev 16854)
+++ trunk/wp-admin/edit-comments.php 2010-12-10 08:49:16 UTC (rev 16855)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx">
</span><span class="cx"> $wp_list_table = get_list_table('WP_Comments_List_Table');
</span><span class="cx"> $wp_list_table->check_permissions();
</span><ins>+$pagenum = $wp_list_table->get_pagenum();
</ins><span class="cx">
</span><span class="cx"> $doaction = $wp_list_table->current_action();
</span><span class="cx">
</span><span class="lines">@@ -37,6 +38,11 @@
</span><span class="cx"> $approved = $unapproved = $spammed = $unspammed = $trashed = $untrashed = $deleted = 0;
</span><span class="cx"> $redirect_to = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids' ), wp_get_referer() );
</span><span class="cx">
</span><ins>+ // 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 );
+
</ins><span class="cx"> foreach ( $comment_ids as $comment_id ) { // Check the permissions on each
</span><span class="cx"> if ( !current_user_can( 'edit_comment', $comment_id ) )
</span><span class="cx"> continue;
</span><span class="lines">@@ -99,6 +105,14 @@
</span><span class="cx">
</span><span class="cx"> $wp_list_table->prepare_items();
</span><span class="cx">
</span><ins>+// 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;
+}
+
</ins><span class="cx"> wp_enqueue_script('admin-comments');
</span><span class="cx"> enqueue_comment_hotkeys_js();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (16854 => 16855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2010-12-10 08:20:46 UTC (rev 16854)
+++ trunk/wp-admin/edit.php 2010-12-10 08:49:16 UTC (rev 16855)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx"> $wp_list_table = get_list_table('WP_Posts_List_Table');
</span><span class="cx"> $wp_list_table->check_permissions();
</span><ins>+$pagenum = $wp_list_table->get_pagenum();
</ins><span class="cx">
</span><span class="cx"> // Back-compat for viewing comments of an entry
</span><span class="cx"> foreach ( array( 'p', 'attachment_id', 'page_id' ) as $_redirect ) {
</span><span class="lines">@@ -26,6 +27,11 @@
</span><span class="cx"> if ( $doaction ) {
</span><span class="cx"> check_admin_referer('bulk-posts');
</span><span class="cx"> $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
</span><ins>+
+ // 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 );
</ins><span class="cx">
</span><span class="cx"> if ( strpos($sendback, 'post.php') !== false )
</span><span class="cx"> $sendback = admin_url($post_new_file);
</span><span class="lines">@@ -60,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> $trashed++;
</span><span class="cx"> }
</span><del>- $sendback = add_query_arg( array('trashed' => $trashed, 'ids' => join(',', $post_ids)), $sendback );
</del><ins>+ $sendback = add_query_arg( array('trashed' => $trashed, 'ids' => join(',', $post_ids) ), $sendback );
</ins><span class="cx"> break;
</span><span class="cx"> case 'untrash':
</span><span class="cx"> $untrashed = 0;
</span><span class="lines">@@ -127,6 +133,14 @@
</span><span class="cx">
</span><span class="cx"> $wp_list_table->prepare_items();
</span><span class="cx">
</span><ins>+// 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;
+}
+
</ins><span class="cx"> wp_enqueue_script('inline-edit-post');
</span><span class="cx">
</span><span class="cx"> $title = $post_type_object->labels->name;
</span></span></pre>
</div>
</div>
</body>
</html>