<!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>[12461] trunk/wp-admin/edit-comments.php:
Ensure that bulk comment actions do not remove spaces from search terms.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12461">12461</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-12-19 11:30:54 +0000 (Sat, 19 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure that bulk comment actions do not remove spaces from search terms.
Also refactors comment bulk action redirect url building to be consistent with other operations.
Fixes <a href="http://trac.wordpress.org/ticket/11471">#11471</a> props nacin.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.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 (12460 => 12461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2009-12-19 11:07:16 UTC (rev 12460)
+++ trunk/wp-admin/edit-comments.php 2009-12-19 11:30:54 UTC (rev 12461)
</span><span class="lines">@@ -32,10 +32,11 @@
</span><span class="cx"> $comment_ids = array_map( 'absint', explode(',', $_REQUEST['ids']) );
</span><span class="cx"> $doaction = $_REQUEST['action'];
</span><span class="cx"> } else {
</span><del>- wp_redirect($_SERVER['HTTP_REFERER']);
</del><ins>+ wp_redirect( wp_get_referer() );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $approved = $unapproved = $spammed = $unspammed = $trashed = $untrashed = $deleted = 0;
</span><ins>+ $redirect_to = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids'), wp_get_referer() );
</ins><span class="cx">
</span><span class="cx"> foreach ($comment_ids as $comment_id) { // Check the permissions on each
</span><span class="cx"> $_post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment_id) );
</span><span class="lines">@@ -75,8 +76,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $redirect_to = 'edit-comments.php';
-
</del><span class="cx"> if ( $approved )
</span><span class="cx"> $redirect_to = add_query_arg( 'approved', $approved, $redirect_to );
</span><span class="cx"> if ( $unapproved )
</span><span class="lines">@@ -94,17 +93,8 @@
</span><span class="cx"> if ( $trashed || $spammed )
</span><span class="cx"> $redirect_to = add_query_arg( 'ids', join(',', $comment_ids), $redirect_to );
</span><span class="cx">
</span><del>- if ( $post_id )
- $redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to );
- if ( isset($_REQUEST['apage']) )
- $redirect_to = add_query_arg( 'apage', absint($_REQUEST['apage']), $redirect_to );
- if ( !empty($_REQUEST['mode']) )
- $redirect_to = add_query_arg('mode', $_REQUEST['mode'], $redirect_to);
- if ( !empty($_REQUEST['comment_status']) )
- $redirect_to = add_query_arg('comment_status', $_REQUEST['comment_status'], $redirect_to);
- if ( !empty($_REQUEST['s']) )
- $redirect_to = add_query_arg('s', $_REQUEST['s'], $redirect_to);
</del><span class="cx"> wp_redirect( $redirect_to );
</span><ins>+ exit;
</ins><span class="cx"> } elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
</span><span class="cx"> wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
</span><span class="cx"> exit;
</span></span></pre>
</div>
</div>
</body>
</html>