<!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>[15667] trunk/wp-admin/edit.php: Partially revert [15642].</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15667">15667</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-09-26 10:56:36 +0000 (Sun, 26 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Partially revert <a href="http://trac.wordpress.org/changeset/15642">[15642]</a>. Fixes Bulk deletion of non-media items. As a bonus, exit on redirects & check the post status is valid before querying it. See <a href="http://trac.wordpress.org/ticket/14579">#14579</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 (15666 => 15667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2010-09-26 10:02:23 UTC (rev 15666)
+++ trunk/wp-admin/edit.php 2010-09-26 10:56:36 UTC (rev 15667)
</span><span class="lines">@@ -31,16 +31,21 @@
</span><span class="cx"> $sendback = admin_url($post_new_file);
</span><span class="cx">
</span><span class="cx"> if ( 'delete_all' == $doaction ) {
</span><del>- $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'" );
</del><ins>+ $post_status = preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['post_status']);
+ if ( get_post_status_object($post_status) ) // Check the post status exists first
+ $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type=%s AND post_status = %s", $post_type, $post_status ) );
</ins><span class="cx"> $doaction = 'delete';
</span><span class="cx"> } elseif ( isset( $_REQUEST['media'] ) ) {
</span><span class="cx"> $post_ids = $_REQUEST['media'];
</span><span class="cx"> } elseif ( isset( $_REQUEST['ids'] ) ) {
</span><span class="cx"> $post_ids = explode( ',', $_REQUEST['ids'] );
</span><ins>+ } elseif ( !empty( $_REQUEST['post'] ) ) {
+ $post_ids = array_map('intval', $_REQUEST['post']);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !isset( $post_ids ) ) {
</span><span class="cx"> wp_redirect( admin_url("edit.php?post_type=$post_type") );
</span><ins>+ exit;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch ( $doaction ) {
</span></span></pre>
</div>
</div>
</body>
</html>