<!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>[15666] trunk/wp-admin: Use the correct variable names, Fixes "Empty Spam"
comments & "Approve" link.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15666">15666</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-09-26 10:02:23 +0000 (Sun, 26 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the correct variable names, Fixes "Empty Spam" comments & "Approve" link. Add a clear to push "No comments found." into place. Fixes <a href="http://trac.wordpress.org/ticket/14964">#14964</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadminincludesdefaultlisttablesphp">trunk/wp-admin/includes/default-list-tables.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 (15665 => 15666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2010-09-26 09:37:25 UTC (rev 15665)
+++ trunk/wp-admin/edit-comments.php 2010-09-26 10:02:23 UTC (rev 15666)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> if ( $doaction ) {
</span><span class="cx"> check_admin_referer( 'bulk-comments' );
</span><span class="cx">
</span><del>- if ( 'delete_all' == $do_action && !empty( $_REQUEST['pagegen_timestamp'] ) ) {
</del><ins>+ if ( 'delete_all' == $doaction && !empty( $_REQUEST['pagegen_timestamp'] ) ) {
</ins><span class="cx"> $comment_status = $wpdb->escape( $_REQUEST['comment_status'] );
</span><span class="cx"> $delete_time = $wpdb->escape( $_REQUEST['pagegen_timestamp'] );
</span><span class="cx"> $comment_ids = $wpdb->get_col( "SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = '$comment_status' AND '$delete_time' > comment_date_gmt" );
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> $comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );
</span><span class="cx"> } else {
</span><span class="cx"> wp_redirect( wp_get_referer() );
</span><ins>+ exit;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $approved = $unapproved = $spammed = $unspammed = $trashed = $untrashed = $deleted = 0;
</span><span class="lines">@@ -217,6 +218,8 @@
</span><span class="cx"> <input type="hidden" name="paged" value="<?php echo esc_attr( absint( $_REQUEST['paged'] ) ); ?>" />
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><ins>+<br class="clear" />
+
</ins><span class="cx"> <?php if ( $wp_list_table->has_items() ) { ?>
</span><span class="cx">
</span><span class="cx"> <?php $wp_list_table->display_table(); ?>
</span></span></pre></div>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15665 => 15666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-09-26 09:37:25 UTC (rev 15665)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-09-26 10:02:23 UTC (rev 15666)
</span><span class="lines">@@ -2440,7 +2440,7 @@
</span><span class="cx"> if ( ( 'reply' == $action || 'quickedit' == $action ) && ! $this->from_ajax )
</span><span class="cx"> $action .= ' hide-if-no-js';
</span><span class="cx"> elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) {
</span><del>- if ( '1' == get_comment_meta( $comment_id, '_wp_trash_meta_status', true ) )
</del><ins>+ if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) )
</ins><span class="cx"> $action .= ' approve';
</span><span class="cx"> else
</span><span class="cx"> $action .= ' unapprove';
</span></span></pre>
</div>
</div>
</body>
</html>