<!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>[17362] trunk/wp-admin/edit.php: Fix redirects for trashed post bulk ops.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17362">17362</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-01-25 19:30:24 +0000 (Tue, 25 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix redirects for trashed post bulk ops. Props nacin, SergeyBiryukov. fixes <a href="http://trac.wordpress.org/ticket/16355">#16355</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (17361 => 17362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2011-01-25 19:20:20 UTC (rev 17361)
+++ trunk/wp-admin/edit.php 2011-01-25 19:30:24 UTC (rev 17362)
</span><span class="lines">@@ -35,6 +35,16 @@
</span><span class="cx"> }
</span><span class="cx"> unset( $_redirect );
</span><span class="cx">
</span><ins>+if ( 'post' != $post_type ) {
+ $parent_file = "edit.php?post_type=$post_type";
+ $submenu_file = "edit.php?post_type=$post_type";
+ $post_new_file = "post-new.php?post_type=$post_type";
+} else {
+ $parent_file = 'edit.php';
+ $submenu_file = 'edit.php';
+ $post_new_file = 'post-new.php';
+}
+
</ins><span class="cx"> $doaction = $wp_list_table->current_action();
</span><span class="cx">
</span><span class="cx"> if ( $doaction ) {
</span><span class="lines">@@ -59,7 +69,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !isset( $post_ids ) ) {
</span><del>- wp_redirect( admin_url("edit.php?post_type=$post_type") );
</del><ins>+ wp_redirect( $sendback );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -130,16 +140,6 @@
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( 'post' != $post_type ) {
- $parent_file = "edit.php?post_type=$post_type";
- $submenu_file = "edit.php?post_type=$post_type";
- $post_new_file = "post-new.php?post_type=$post_type";
-} else {
- $parent_file = 'edit.php';
- $submenu_file = 'edit.php';
- $post_new_file = 'post-new.php';
-}
-
</del><span class="cx"> $wp_list_table->prepare_items();
</span><span class="cx">
</span><span class="cx"> $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
</span><span class="lines">@@ -246,6 +246,9 @@
</span><span class="cx">
</span><span class="cx"> <input type="hidden" name="post_status" class="post_status_page" value="<?php echo !empty($_REQUEST['post_status']) ? esc_attr($_REQUEST['post_status']) : 'all'; ?>" />
</span><span class="cx"> <input type="hidden" name="post_type" class="post_type_page" value="<?php echo $post_type; ?>" />
</span><ins>+<?php if ( ! empty( $_REQUEST['show_sticky'] ) ) { ?>
+<input type="hidden" name="show_sticky" value="1" />
+<?php } ?>
</ins><span class="cx">
</span><span class="cx"> <?php $wp_list_table->display(); ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>