<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11731] trunk: "Trash" status for comments, first run, props caesarsgrunt,
see #4529</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11731">11731</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-07-21 03:11:12 +0000 (Tue, 21 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>"Trash" status for comments, first run, props caesarsgrunt, see <a href="http://trac.wordpress.org/ticket/4529">#4529</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadmincommentphp">trunk/wp-admin/comment.php</a></li>
<li><a href="#trunkwpadmincsscolorsclassiccss">trunk/wp-admin/css/colors-classic.css</a></li>
<li><a href="#trunkwpadmincsscolorsfreshcss">trunk/wp-admin/css/colors-fresh.css</a></li>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminjscommondevjs">trunk/wp-admin/js/common.dev.js</a></li>
<li><a href="#trunkwpadminjscommonjs">trunk/wp-admin/js/common.js</a></li>
<li><a href="#trunkwpadminjseditcommentsdevjs">trunk/wp-admin/js/edit-comments.dev.js</a></li>
<li><a href="#trunkwpadminjseditcommentsjs">trunk/wp-admin/js/edit-comments.js</a></li>
<li><a href="#trunkwpadminwpadmincss">trunk/wp-admin/wp-admin.css</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (11730 => 11731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2009-07-20 04:35:11 UTC (rev 11730)
+++ trunk/wp-admin/admin-ajax.php 2009-07-21 03:11:12 UTC (rev 11731)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> die( (string) time() );
</span><span class="cx"> $r = wp_set_comment_status( $comment->comment_ID, 'spam' );
</span><span class="cx"> } else {
</span><del>- $r = wp_delete_comment( $comment->comment_ID );
</del><ins>+ $r = wp_set_comment_status( $comment->comment_ID, 'delete' );
</ins><span class="cx"> }
</span><span class="cx"> if ( $r ) // Decide if we need to send back '1' or a more complicated response including page links and comment counts
</span><span class="cx"> _wp_ajax_delete_comment_response( $comment->comment_ID );
</span></span></pre></div>
<a id="trunkwpadmincommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/comment.php (11730 => 11731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/comment.php 2009-07-20 04:35:11 UTC (rev 11730)
+++ trunk/wp-admin/comment.php 2009-07-21 03:11:12 UTC (rev 11731)
</span><span class="lines">@@ -44,6 +44,9 @@
</span><span class="cx"> if ( !current_user_can('edit_post', $comment->comment_post_ID) )
</span><span class="cx"> comment_footer_die( __('You are not allowed to edit comments on this post.') );
</span><span class="cx">
</span><ins>+ if ( 'deleted' == $comment->comment_status )
+ comment_footer_die( __('This comment has been deleted. Please move it out of the Trash if you want to edit it.') );
+
</ins><span class="cx"> $comment = get_comment_to_edit( $comment_id );
</span><span class="cx">
</span><span class="cx"> include('edit-form-comment.php');
</span></span></pre></div>
<a id="trunkwpadmincsscolorsclassiccss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-classic.css (11730 => 11731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-classic.css 2009-07-20 04:35:11 UTC (rev 11730)
+++ trunk/wp-admin/css/colors-classic.css 2009-07-21 03:11:12 UTC (rev 11731)
</span><span class="lines">@@ -58,7 +58,8 @@
</span><span class="cx"> border-color: #ccc;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#poststuff .inside label.spam {
</del><ins>+#poststuff .inside label.spam,
+#poststuff .inside label.deleted {
</ins><span class="cx"> color: red;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmincsscolorsfreshcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-fresh.css (11730 => 11731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-fresh.css 2009-07-20 04:35:11 UTC (rev 11730)
+++ trunk/wp-admin/css/colors-fresh.css 2009-07-21 03:11:12 UTC (rev 11731)
</span><span class="lines">@@ -58,7 +58,8 @@
</span><span class="cx"> border-color: #ccc;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#poststuff .inside label.spam {
</del><ins>+#poststuff .inside label.spam,
+#poststuff .inside label.deleted {
</ins><span class="cx"> color: red;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (11730 => 11731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2009-07-20 04:35:11 UTC (rev 11730)
+++ trunk/wp-admin/edit-comments.php 2009-07-21 03:11:12 UTC (rev 11731)
</span><span class="lines">@@ -14,32 +14,36 @@
</span><span class="cx">
</span><span class="cx"> $post_id = isset($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0;
</span><span class="cx">
</span><del>-if ( ( isset( $_REQUEST['delete_all_spam'] ) || isset( $_REQUEST['delete_all_spam2'] ) ) && !empty( $_REQUEST['pagegen_timestamp'] ) ) {
- check_admin_referer('bulk-spam-delete', '_spam_nonce');
-
- $delete_time = $wpdb->escape( $_REQUEST['pagegen_timestamp'] );
- if ( current_user_can('moderate_comments')) {
- $deleted_spam = $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" );
- } else {
- $deleted_spam = 0;
- }
- $redirect_to = 'edit-comments.php?comment_status=spam&deleted=' . (int) $deleted_spam;
- if ( $post_id )
- $redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to );
- wp_redirect( $redirect_to );
-} elseif ( isset($_REQUEST['delete_comments']) && isset($_REQUEST['action']) && ( -1 != $_REQUEST['action'] || -1 != $_REQUEST['action2'] ) ) {
</del><ins>+if ( isset($_REQUEST['doaction']) || isset($_REQUEST['doaction2']) || isset($_REQUEST['destroy_all']) || isset($_REQUEST['destroy_all2']) ) {
</ins><span class="cx"> check_admin_referer('bulk-comments');
</span><del>- $doaction = ( -1 != $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2'];
-
- $deleted = $approved = $unapproved = $spammed = 0;
- foreach ( (array) $_REQUEST['delete_comments'] as $comment_id) : // Check the permissions on each
- $comment_id = (int) $comment_id;
</del><ins>+
+ if ((isset($_REQUEST['destroy_all']) || isset($_REQUEST['destroy_all2'])) && !empty($_REQUEST['pagegen_timestamp'])) {
+ $comment_status = $wpdb->escape($_REQUEST['comment_status']);
+ $delete_time = $wpdb->escape($_REQUEST['pagegen_timestamp']);
+ $comment_ids = $wpdb->get_col( "SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = '$comment_status' AND '$delete_time' > comment_date_gmt" );
+ $doaction = 'destroy';
+ } elseif (($_REQUEST['action'] != -1 || $_REQUEST['action2'] != -1) && isset($_REQUEST['delete_comments'])) {
+ $comment_ids = $_REQUEST['delete_comments'];
+ $doaction = ($_REQUEST['action'] != -1) ? $_REQUEST['action'] : $_REQUEST['action2'];
+ } else wp_redirect($_SERVER['HTTP_REFERER']);
+
+ $approved = $unapproved = $spammed = $deleted = $destroyed = 0;
+
+ foreach ($comment_ids as $comment_id) { // Check the permissions on each
</ins><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="cx">
</span><span class="cx"> if ( !current_user_can('edit_post', $_post_id) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> switch( $doaction ) {
</span><ins>+ case 'approve' :
+ wp_set_comment_status($comment_id, 'approve');
+ $approved++;
+ break;
+ case 'unapprove' :
+ wp_set_comment_status($comment_id, 'hold');
+ $unapproved++;
+ break;
</ins><span class="cx"> case 'markspam' :
</span><span class="cx"> wp_set_comment_status($comment_id, 'spam');
</span><span class="cx"> $spammed++;
</span><span class="lines">@@ -48,18 +52,14 @@
</span><span class="cx"> wp_set_comment_status($comment_id, 'delete');
</span><span class="cx"> $deleted++;
</span><span class="cx"> break;
</span><del>- case 'approve' :
- wp_set_comment_status($comment_id, 'approve');
- $approved++;
</del><ins>+ case 'destroy' :
+ wp_set_comment_status($comment_id, 'delete');
+ $destroyed++;
</ins><span class="cx"> break;
</span><del>- case 'unapprove' :
- wp_set_comment_status($comment_id, 'hold');
- $unapproved++;
- break;
</del><span class="cx"> }
</span><del>- endforeach;
</del><ins>+ }
</ins><span class="cx">
</span><del>- $redirect_to = 'edit-comments.php?deleted=' . $deleted . '&approved=' . $approved . '&spam=' . $spammed . '&unapproved=' . $unapproved;
</del><ins>+ $redirect_to = 'edit-comments.php?approved=' . $approved . '&unapproved=' . $unapproved . '&spam=' . $spammed . '&deleted=' . $deleted . '&destroyed=' . $destroyed;
</ins><span class="cx"> if ( $post_id )
</span><span class="cx"> $redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to );
</span><span class="cx"> if ( isset($_REQUEST['apage']) )
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> $mode = ( ! isset($_GET['mode']) || empty($_GET['mode']) ) ? 'detail' : esc_attr($_GET['mode']);
</span><span class="cx">
</span><span class="cx"> $comment_status = isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all';
</span><del>-if ( !in_array($comment_status, array('all', 'moderated', 'approved', 'spam')) )
</del><ins>+if ( !in_array($comment_status, array('all', 'moderated', 'approved', 'spam', 'deleted')) )
</ins><span class="cx"> $comment_status = 'all';
</span><span class="cx">
</span><span class="cx"> $comment_type = !empty($_GET['comment_type']) ? esc_attr($_GET['comment_type']) : '';
</span><span class="lines">@@ -102,26 +102,29 @@
</span><span class="cx"> </h2>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>-if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['spam'] ) ) {
</del><ins>+if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['destroyed'] ) || isset( $_GET['spam'] ) ) {
</ins><span class="cx"> $approved = isset( $_GET['approved'] ) ? (int) $_GET['approved'] : 0;
</span><span class="cx"> $deleted = isset( $_GET['deleted'] ) ? (int) $_GET['deleted'] : 0;
</span><ins>+ $destroyed = isset( $_GET['destroyed'] ) ? (int) $_GET['destroyed'] : 0;
</ins><span class="cx"> $spam = isset( $_GET['spam'] ) ? (int) $_GET['spam'] : 0;
</span><span class="cx">
</span><del>- if ( $approved > 0 || $deleted > 0 || $spam > 0 ) {
</del><ins>+ if ( $approved > 0 || $deleted > 0 || $destroyed > 0 || $spam > 0 ) {
</ins><span class="cx"> echo '<div id="moderated" class="updated fade"><p>';
</span><span class="cx">
</span><span class="cx"> if ( $approved > 0 ) {
</span><span class="cx"> printf( _n( '%s comment approved', '%s comments approved', $approved ), $approved );
</span><span class="cx"> echo '<br />';
</span><span class="cx"> }
</span><del>-
</del><ins>+ if ( $spam > 0 ) {
+ printf( _n( '%s comment marked as spam', '%s comments marked as spam', $spam ), $spam );
+ echo '<br />';
+ }
</ins><span class="cx"> if ( $deleted > 0 ) {
</span><span class="cx"> printf( _n( '%s comment deleted', '%s comments deleted', $deleted ), $deleted );
</span><span class="cx"> echo '<br />';
</span><span class="cx"> }
</span><del>-
- if ( $spam > 0 ) {
- printf( _n( '%s comment marked as spam', '%s comments marked as spam', $spam ), $spam );
</del><ins>+ if ( $destroyed > 0 ) {
+ printf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $destroyed ), $destroyed );
</ins><span class="cx"> echo '<br />';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -139,9 +142,10 @@
</span><span class="cx"> //, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
</span><span class="cx"> $stati = array(
</span><span class="cx"> 'all' => _n_noop('All', 'All'), // singular not used
</span><del>- 'moderated' => _n_noop('Pending (<span class="pending-count">%s</span>)', 'Pending (<span class="pending-count">%s</span>)'),
</del><ins>+ 'moderated' => _n_noop('Pending <span class="count">(<span class="pending-count">%s</span>)</span>', 'Pending <span class="count">(<span class="pending-count">%s</span>)</span>'),
</ins><span class="cx"> 'approved' => _n_noop('Approved', 'Approved'), // singular not used
</span><del>- 'spam' => _n_noop('Spam (<span class="spam-count">%s</span>)', 'Spam (<span class="spam-count">%s</span>)')
</del><ins>+ 'spam' => _n_noop('Spam <span class="count">(<span class="spam-count">%s</span>)</span>', 'Spam <span class="count">(<span class="spam-count">%s</span>)</span>'),
+ 'deleted' => _n_noop('Trash <span class="count">(<span class="deleted-count">%s</span>)</span>', 'Trash <span class="count">(<span class="deleted-count">%s</span>)</span>')
</ins><span class="cx"> );
</span><span class="cx"> $link = 'edit-comments.php';
</span><span class="cx"> if ( !empty($comment_type) && 'all' != $comment_type )
</span><span class="lines">@@ -246,13 +250,17 @@
</span><span class="cx"> <?php if ( 'all' == $comment_status || 'approved' == $comment_status ): ?>
</span><span class="cx"> <option value="unapprove"><?php _e('Unapprove'); ?></option>
</span><span class="cx"> <?php endif; ?>
</span><del>-<?php if ( 'all' == $comment_status || 'moderated' == $comment_status || 'spam' == $comment_status ): ?>
</del><ins>+<?php if ( 'approved' != $comment_status ): ?>
</ins><span class="cx"> <option value="approve"><?php _e('Approve'); ?></option>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( 'spam' != $comment_status ): ?>
</span><span class="cx"> <option value="markspam"><?php _e('Mark as Spam'); ?></option>
</span><span class="cx"> <?php endif; ?>
</span><ins>+<?php if ( 'deleted' == $comment_status || 'spam' == $comment_status ): ?>
+<option value="destroy"><?php _e('Delete Permanently'); ?></option>
+<?php else: ?>
</ins><span class="cx"> <option value="delete"><?php _e('Delete'); ?></option>
</span><ins>+<?php endif; ?>
</ins><span class="cx"> </select>
</span><span class="cx"> <input type="submit" name="doaction" id="doaction" value="<?php esc_attr_e('Apply'); ?>" class="button-secondary apply" />
</span><span class="cx"> <?php wp_nonce_field('bulk-comments'); ?>
</span><span class="lines">@@ -278,11 +286,11 @@
</span><span class="cx"> <input type="hidden" name="apage" value="<?php echo esc_attr( absint( $_GET['apage'] ) ); ?>" />
</span><span class="cx"> <?php }
</span><span class="cx">
</span><del>-if ( 'spam' == $comment_status ) {
- wp_nonce_field('bulk-spam-delete', '_spam_nonce');
</del><ins>+if ( 'spam' == $comment_status || 'deleted' == $comment_status ) {
+ wp_nonce_field('bulk-destroy', '_destroy_nonce');
</ins><span class="cx"> if ( current_user_can ('moderate_comments')) { ?>
</span><del>- <input type="submit" name="delete_all_spam" value="<?php esc_attr_e('Delete All Spam'); ?>" class="button-secondary apply" />
-<?php }
</del><ins>+ <input type="submit" name="destroy_all" id="destroy_all" value="<?php esc_attr_e('Permanently Delete All'); ?>" class="button-secondary apply" />
+<?php }
</ins><span class="cx"> } ?>
</span><span class="cx"> <?php do_action('manage_comments_nav', $comment_status); ?>
</span><span class="cx"> </div>
</span><span class="lines">@@ -333,18 +341,22 @@
</span><span class="cx"> <?php if ( 'all' == $comment_status || 'approved' == $comment_status ): ?>
</span><span class="cx"> <option value="unapprove"><?php _e('Unapprove'); ?></option>
</span><span class="cx"> <?php endif; ?>
</span><del>-<?php if ( 'all' == $comment_status || 'moderated' == $comment_status || 'spam' == $comment_status ): ?>
</del><ins>+<?php if ( 'approved' != $comment_status ): ?>
</ins><span class="cx"> <option value="approve"><?php _e('Approve'); ?></option>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( 'spam' != $comment_status ): ?>
</span><span class="cx"> <option value="markspam"><?php _e('Mark as Spam'); ?></option>
</span><span class="cx"> <?php endif; ?>
</span><ins>+<?php if ( 'deleted' == $comment_status || 'spam' == $comment_status ): ?>
+<option value="destroy"><?php _e('Delete Permanently'); ?></option>
+<?php else: ?>
</ins><span class="cx"> <option value="delete"><?php _e('Delete'); ?></option>
</span><ins>+<?php endif; ?>
</ins><span class="cx"> </select>
</span><span class="cx"> <input type="submit" name="doaction2" id="doaction2" value="<?php esc_attr_e('Apply'); ?>" class="button-secondary apply" />
</span><span class="cx">
</span><del>-<?php if ( 'spam' == $comment_status ) { ?>
-<input type="submit" name="delete_all_spam2" value="<?php esc_attr_e('Delete All Spam'); ?>" class="button-secondary apply" />
</del><ins>+<?php if ( 'spam' == $comment_status || 'deleted' == $comment_status ) { ?>
+<input type="submit" name="destroy_all2" id="destroy_all2" value="<?php esc_attr_e('Permanently Delete All'); ?>" class="button-secondary apply" />
</ins><span class="cx"> <?php } ?>
</span><span class="cx"> <?php do_action('manage_comments_nav', $comment_status); ?>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (11730 => 11731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2009-07-20 04:35:11 UTC (rev 11730)
+++ trunk/wp-admin/includes/template.php 2009-07-21 03:11:12 UTC (rev 11731)
</span><span class="lines">@@ -2009,6 +2009,9 @@
</span><span class="cx"> } elseif ( 'spam' == $status ) {
</span><span class="cx"> $approved = "comment_approved = 'spam'";
</span><span class="cx"> $total = $count->spam;
</span><ins>+ } elseif ( 'deleted' == $status ) {
+ $approved = "comment_approved = 'deleted'";
+ $total = $count->deleted;
</ins><span class="cx"> } else {
</span><span class="cx"> $approved = "( comment_approved = '0' OR comment_approved = '1' )";
</span><span class="cx"> $total = $count->moderated + $count->approved;
</span><span class="lines">@@ -2135,24 +2138,36 @@
</span><span class="cx"> $actions = array();
</span><span class="cx">
</span><span class="cx"> if ( $user_can ) {
</span><del>- $actions['approve'] = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved vim-a' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
- $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
- if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments
- if ( 'approved' == $the_comment_status ) {
- $actions['unapprove'] = "<a href='$unapprove_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=unapproved vim-u vim-destructive' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
- unset($actions['approve']);
</del><ins>+ if ( 'deleted' == $the_comment_status ) {
+ $actions['unapprove'] = "<a href='$unapprove_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=unapproved vim-u vim-destructive' title='" . __( 'Return this comment to Unapproved status' ) . "'>" . __( 'Return to Pending' ) . '</a>';
+ $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID::deleted=1 delete vim-d vim-destructive'>" . __('Delete Permanently') . '</a>';
+ } else {
+ $actions['approve'] = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved vim-a' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+ $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
+
+ if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments
+ if ( 'approved' == $the_comment_status ) {
+ $actions['unapprove'] = "<a href='$unapprove_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=unapproved vim-u vim-destructive' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
+ unset($actions['approve']);
+ } else {
+ $actions['approve'] = "<a href='$approve_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=approved vim-a vim-destructive' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+ unset($actions['unapprove']);
+ }
+ }
+
+ if ( 'spam' == $the_comment_status ) {
+ $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID::deleted=1 delete vim-d vim-destructive'>" . __('Delete Permanently') . '</a>';
</ins><span class="cx"> } else {
</span><del>- $actions['approve'] = "<a href='$approve_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=approved vim-a vim-destructive' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
- unset($actions['unapprove']);
</del><ins>+ $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
+ $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>';
</ins><span class="cx"> }
</span><ins>+
+ $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>';
+ $actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>';
+
+ if ( 'spam' != $the_comment_status )
+ $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\');return false;" class="vim-r" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
</ins><span class="cx"> }
</span><del>- if ( 'spam' != $the_comment_status )
- $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
- $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>';
- $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>';
- $actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>';
- if ( 'spam' != $the_comment_status )
- $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\');return false;" class="vim-r" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
</del><span class="cx">
</span><span class="cx"> $actions = apply_filters( 'comment_row_actions', $actions, $comment );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminjscommondevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/common.dev.js (11730 => 11731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/common.dev.js 2009-07-20 04:35:11 UTC (rev 11730)
+++ trunk/wp-admin/js/common.dev.js 2009-07-21 03:11:12 UTC (rev 11731)
</span><span class="lines">@@ -156,10 +156,13 @@
</span><span class="cx">
</span><span class="cx"> // show warnings
</span><span class="cx"> $('#doaction, #doaction2').click(function(){
</span><del>- if ( $('select[name="action"]').val() == 'delete' || $('select[name="action2"]').val() == 'delete' ) {
</del><ins>+ if ( $('select[name="action"]').val() == 'destroy' || $('select[name="action2"]').val() == 'destroy' ) {
</ins><span class="cx"> return showNotice.warn();
</span><span class="cx"> }
</span><span class="cx"> });
</span><ins>+ $('#destroy_all, #destroy_all2').click(function(){
+ return showNotice.warn();
+ });
</ins><span class="cx">
</span><span class="cx"> // screen settings tab
</span><span class="cx"> $('#show-settings-link').click(function () {
</span></span></pre></div>
<a id="trunkwpadminjscommonjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/common.js (11730 => 11731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/common.js 2009-07-20 04:35:11 UTC (rev 11730)
+++ trunk/wp-admin/js/common.js 2009-07-21 03:11:12 UTC (rev 11731)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var showNotice,adminMenu,columns,validateForm;(function(a){adminMenu={init:function(){a("#adminmenu div.wp-menu-toggle").each(function(){if(a(this).siblings(".wp-submenu").length){a(this).click(function(){adminMenu.toggle(a(this).siblings(".wp-submenu"))})}else{a(this).hide()}});this.favorites();a("a.separator").click(function(){if(a("body").hasClass("folded")){adminMenu.fold(1);deleteUserSetting("mfold")}else{adminMenu.fold();setUserSetting("mfold","f")}return false});if(a("body").hasClass("folded")){this.fold()}this.restoreMenuState()},restoreMenuState:function(){a("#adminmenu li.wp-has-submenu").each(function(c,d){var b=getUserSetting("m"+c);if(a(d).hasClass("wp-has-current-submenu")){return true}if("o"==b){a(d).addClass("wp-menu-open")}else{if("c"==b){a(d).removeClass("wp-menu-open")}}})},toggle:function(b){b.slideToggle(150,function(){b.css("display","")}).parent().toggleClass("wp-menu-open");a("#adminmenu li.wp-has-submenu").each(function(d,f){var c=a(f).hasClass("wp-menu-open")?"o":"c";setUserSetting("m"+d,c)});return false},fold:function(b){if(b){a("body").removeClass("folded");a("#adminmenu li.wp-has-submenu").unbind()}else{a("body").addClass("folded");a("#adminmenu li.wp-has-submenu").hoverIntent({over:function(j){var d,c,g,k,i;d=a(this).find(".wp-submenu");c=d.parent().offset().top+d.height()+1;g=a("#wpwrap").height();k=60+c-g;i=a(window).height()+a("body").scrollTop()-15;if(i<(c-k)){k=c-i}if(k>1){d.css({marginTop:"-"+k+"px"})}else{if(d.css("marginTop")){d.css({marginTop:""})}}d.addClass("sub-open")},out:function(){a(this).find(".wp-submenu").removeClass("sub-open").css({marginTop:""})},timeout:220,sensitivity:8,interval:100})}},favorites:function(){a("#favorite-inside").width(a("#favorite-actions").width()-4);a("#favorite-toggle, #favorite-inside").bind("mouseenter",function(){a("#favorite-inside").removeClass("slideUp").addClass("slideDown");setTimeout(function(){if(a("#favorite-inside").hasClass("slideDown")){a("#favorite-inside").slideDown(100);a("#favorite-first").addClass("slide-down")}},200)});a("#favorite-toggle, #favorite-inside").bind("mouseleave",function(){a("#favorite-inside").removeClass("slideDown").addClass("slideUp");setTimeout(function(){if(a("#favorite-inside").hasClass("slideUp")){a("#favorite-inside").slideUp(100,function(){a("#favorite-first").removeClass("slide-down")})}},300)})}};a(document).ready(function(){adminMenu.init()});columns={init:function(){a(".hide-column-tog").click(function(){var c=a(this).val(),b=a(this).attr("checked");if(b){a(".column-"+c).show()}else{a(".column-"+c).hide()}columns.save_manage_columns_state()})},save_manage_columns_state:function(){var b=a(".manage-column").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})}};a(document).ready(function(){columns.init()});validateForm=function(b){return !a(b).find(".form-required").filter(function(){return a("input:visible",this).val()==""}).addClass("form-invalid").change(function(){a(this).removeClass("form-invalid")}).size()}})(jQuery);showNotice={warn:function(){var a=commonL10n.warnDelete||"";if(confirm(a)){return true}return false},note:function(a){alert(a)}};jQuery(document).ready(function(d){var f=false,a,e,c,b;d(".fade").animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300).animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300);d("div.wrap h2 ~ div.updated, div.wrap h2 ~ div.error").addClass("below-h2");d("div.updated, div.error").not(".below-h2").insertAfter("div.wrap h2:first");d("#doaction, #doaction2").click(function(){if(d('select[name="action"]').val()=="delete"||d('select[name="action2"]').val()=="delete"){return showNotice.warn()}});d("#show-settings-link").click(function(){if(!d("#screen-options-wrap").hasClass("screen-options-open")){d("#contextual-help-link-wrap").css("visibility","hidden")}d("#screen-options-wrap").slideToggle("fast",function(){if(d(this).hasClass("screen-options-open")){d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#contextual-help-link-wrap").css("visibility","");d(this).removeClass("screen-options-open")}else{d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("screen-options-open")}});return false});d("#contextual-help-link").click(function(){if(!d("#contextual-help-wrap").hasClass("contextual-help-open")){d("#screen-options-link-wrap").css("visibility","hidden")}d("#contextual-help-wrap").slideToggle("fast",function(){if(d(this).hasClass("contextual-help-open")){d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#screen-options-link-wrap").css("visibility","");d(this).removeClass("contextual-help-open")}else{d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("contextual-help-open")}});return false});d("#contextual-help-link-wrap, #screen-options-link-wrap").show();d("table:visible tbody .check-column :checkbox").click(function(g){if("undefined"==g.shiftKey){return true}if(g.shiftKey){if(!f){return true}a=d(f).parents("form:first").find(":checkbox");e=a.index(f);c=a.index(this);b=d(this).attr("checked");if(0<e&&0<c&&e!=c){a.slice(e,c).attr("checked",function(){if(d(this).parents("tr").is(":visible")){return b?"checked":""}return""})}}f=this;return true});d("thead :checkbox, tfoot :checkbox").click(function(i){var j=d(this).attr("checked"),h="undefined"==typeof toggleWithKeyboard?false:toggleWithKeyboard,g=i.shiftKey||h;d(this).parents("form:first").find("table tbody:visible").find(".check-column :checkbox").attr("checked",function(){if(d(this).parents("tr").is(":hidden")){return""}if(g){return d(this).attr("checked")?"":"checked"}else{if(j){return"checked"}}return""});d(this).parents("form:first").find("table thead:visible, table tfoot:visible").find(".check-column :checkbox").attr("checked",function(){if(g){return""}else{if(j){return"checked"}}return""})});d("#default-password-nag-no").click(function(){setUserSetting("default_password_nag","hide");d("div.default-password-nag").hide();return false})});jQuery(document).ready(function(b){var a=b(".turbo-nag");if(!a.length||("undefined"!=typeof(google)&&google.gears)){return}if("undefined"!=typeof GearsFactory){return}else{try{if(("undefined"!=typeof window.ActiveXObject&&ActiveXObject("Gears.Factory"))||("undefined"!=typeof navigator.mimeTypes&&navigator.mimeTypes["application/x-googlegears"])){return}}catch(c){}}a.show()});
</del><span class="cx">\ No newline at end of file
</span><ins>+var showNotice,adminMenu,columns,validateForm;(function(a){adminMenu={init:function(){a("#adminmenu div.wp-menu-toggle").each(function(){if(a(this).siblings(".wp-submenu").length){a(this).click(function(){adminMenu.toggle(a(this).siblings(".wp-submenu"))})}else{a(this).hide()}});this.favorites();a("a.separator").click(function(){if(a("body").hasClass("folded")){adminMenu.fold(1);deleteUserSetting("mfold")}else{adminMenu.fold();setUserSetting("mfold","f")}return false});if(a("body").hasClass("folded")){this.fold()}this.restoreMenuState()},restoreMenuState:function(){a("#adminmenu li.wp-has-submenu").each(function(c,d){var b=getUserSetting("m"+c);if(a(d).hasClass("wp-has-current-submenu")){return true}if("o"==b){a(d).addClass("wp-menu-open")}else{if("c"==b){a(d).removeClass("wp-menu-open")}}})},toggle:function(b){b.slideToggle(150,function(){b.css("display","")}).parent().toggleClass("wp-menu-open");a("#adminmenu li.wp-has-submenu").each(function(d,f){var c=a(f).hasClass("wp-menu-open")?"o":"c";setUserSetting("m"+d,c)});return false},fold:function(b){if(b){a("body").removeClass("folded");a("#adminmenu li.wp-has-submenu").unbind()}else{a("body").addClass("folded");a("#adminmenu li.wp-has-submenu").hoverIntent({over:function(j){var d,c,g,k,i;d=a(this).find(".wp-submenu");c=d.parent().offset().top+d.height()+1;g=a("#wpwrap").height();k=60+c-g;i=a(window).height()+a("body").scrollTop()-15;if(i<(c-k)){k=c-i}if(k>1){d.css({marginTop:"-"+k+"px"})}else{if(d.css("marginTop")){d.css({marginTop:""})}}d.addClass("sub-open")},out:function(){a(this).find(".wp-submenu").removeClass("sub-open").css({marginTop:""})},timeout:220,sensitivity:8,interval:100})}},favorites:function(){a("#favorite-inside").width(a("#favorite-actions").width()-4);a("#favorite-toggle, #favorite-inside").bind("mouseenter",function(){a("#favorite-inside").removeClass("slideUp").addClass("slideDown");setTimeout(function(){if(a("#favorite-inside").hasClass("slideDown")){a("#favorite-inside").slideDown(100);a("#favorite-first").addClass("slide-down")}},200)});a("#favorite-toggle, #favorite-inside").bind("mouseleave",function(){a("#favorite-inside").removeClass("slideDown").addClass("slideUp");setTimeout(function(){if(a("#favorite-inside").hasClass("slideUp")){a("#favorite-inside").slideUp(100,function(){a("#favorite-first").removeClass("slide-down")})}},300)})}};a(document).ready(function(){adminMenu.init()});columns={init:function(){a(".hide-column-tog").click(function(){var c=a(this).val(),b=a(this).attr("checked");if(b){a(".column-"+c).show()}else{a(".column-"+c).hide()}columns.save_manage_columns_state()})},save_manage_columns_state:function(){var b=a(".manage-column").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})}};a(document).ready(function(){columns.init()});validateForm=function(b){return !a(b).find(".form-required").filter(function(){return a("input:visible",this).val()==""}).addClass("form-invalid").change(function(){a(this).removeClass("form-invalid")}).size()}})(jQuery);showNotice={warn:function(){var a=commonL10n.warnDelete||"";if(confirm(a)){return true}return false},note:function(a){alert(a)}};jQuery(document).ready(function(d){var f=false,a,e,c,b;d(".fade").animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300).animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300);d("div.wrap h2 ~ div.updated, div.wrap h2 ~ div.error").addClass("below-h2");d("div.updated, div.error").not(".below-h2").insertAfter("div.wrap h2:first");d("#doaction, #doaction2").click(function(){if(d('select[name="action"]').val()=="destroy"||d('select[name="action2"]').val()=="destroy"){return showNotice.warn()}});d("#destroy_all, #destroy_all2").click(function(){return showNotice.warn()});d("#show-settings-link").click(function(){if(!d("#screen-options-wrap").hasClass("screen-options-open")){d("#contextual-help-link-wrap").css("visibility","hidden")}d("#screen-options-wrap").slideToggle("fast",function(){if(d(this).hasClass("screen-options-open")){d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#contextual-help-link-wrap").css("visibility","");d(this).removeClass("screen-options-open")}else{d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("screen-options-open")}});return false});d("#contextual-help-link").click(function(){if(!d("#contextual-help-wrap").hasClass("contextual-help-open")){d("#screen-options-link-wrap").css("visibility","hidden")}d("#contextual-help-wrap").slideToggle("fast",function(){if(d(this).hasClass("contextual-help-open")){d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#screen-options-link-wrap").css("visibility","");d(this).removeClass("contextual-help-open")}else{d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("contextual-help-open")}});return false});d("#contextual-help-link-wrap, #screen-options-link-wrap").show();d("table:visible tbody .check-column :checkbox").click(function(g){if("undefined"==g.shiftKey){return true}if(g.shiftKey){if(!f){return true}a=d(f).parents("form:first").find(":checkbox");e=a.index(f);c=a.index(this);b=d(this).attr("checked");if(0<e&&0<c&&e!=c){a.slice(e,c).attr("checked",function(){if(d(this).parents("tr").is(":visible")){return b?"checked":""}return""})}}f=this;return true});d("thead :checkbox, tfoot :checkbox").click(function(i){var j=d(this).attr("checked"),h="undefined"==typeof toggleWithKeyboard?false:toggleWithKeyboard,g=i.shiftKey||h;d(this).parents("form:first").find("table tbody:visible").find(".check-column :checkbox").attr("checked",function(){if(d(this).parents("tr").is(":hidden")){return""}if(g){return d(this).attr("checked")?"":"checked"}else{if(j){return"checked"}}return""});d(this).parents("form:first").find("table thead:visible, table tfoot:visible").find(".check-column :checkbox").attr("checked",function(){if(g){return""}else{if(j){return"checked"}}return""})});d("#default-password-nag-no").click(function(){setUserSetting("default_password_nag","hide");d("div.default-password-nag").hide();return false})});jQuery(document).ready(function(b){var a=b(".turbo-nag");if(!a.length||("undefined"!=typeof(google)&&google.gears)){return}if("undefined"!=typeof GearsFactory){return}else{try{if(("undefined"!=typeof window.ActiveXObject&&ActiveXObject("Gears.Factory"))||("undefined"!=typeof navigator.mimeTypes&&navigator.mimeTypes["application/x-googlegears"])){return}}catch(c){}}a.show()});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminjseditcommentsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/edit-comments.dev.js (11730 => 11731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/edit-comments.dev.js 2009-07-20 04:35:11 UTC (rev 11730)
+++ trunk/wp-admin/js/edit-comments.dev.js 2009-07-21 03:11:12 UTC (rev 11731)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> settings.data._page = pageInput.val();
</span><span class="cx"> settings.data._url = document.location.href;
</span><span class="cx">
</span><del>- if ( 'undefined' != showNotice && settings.data.action && settings.data.action == 'delete-comment' && !settings.data.spam )
</del><ins>+ if ( 'undefined' != showNotice && settings.data.action && settings.data.action == 'delete-comment' && settings.data.deleted)
</ins><span class="cx"> return showNotice.warn() ? settings : false;
</span><span class="cx">
</span><span class="cx"> return settings;
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> if ( isNaN(n) ) return;
</span><span class="cx"> if ( $(settings.target).parents( 'span.spam' ).size() ) { // we marked a comment as spam
</span><span class="cx"> n = n + 1;
</span><del>- } else if ( $('#' + settings.element).is('.spam') ) { // we approved or deleted a comment marked as spam
</del><ins>+ } else if ( $('#' + settings.element).is('.spam') ) { // we approved, deleted, or destroyed a comment marked as spam
</ins><span class="cx"> n = n - 1;
</span><span class="cx"> }
</span><span class="cx"> if ( n < 0 ) { n = 0; }
</span><span class="lines">@@ -101,7 +101,26 @@
</span><span class="cx"> a.html(n);
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ $('span.deleted-count').each( function() {
+ var a = $(this), n;
+ n = a.html().replace(/[ ,.]+/g, '');
+ n = parseInt(n,10);
+ if ( isNaN(n) ) return;
+ if ( $(settings.target).parents( 'span.delete' ).size() && $('#' + settings.element).is('.deleted,.spam') ) { // we destroyed a deleted or spam comment
+ n--;
+ } else if ( $(settings.target).parents( 'span.delete' ).size() ) { // we deleted a comment
+ n++;
+ } else if ( $('#' + settings.element).is('.deleted') ) { // we approved or spammed a deleted comment
+ n--;
+ }
+ if ( n < 0 ) { n = 0; }
+ n = n.toString();
+ if ( n.length > 3 )
+ n = n.substr(0, n.length-3)+' '+n.substr(-3);
+ a.html(n);
+ });
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> // XML response
</span><span class="cx"> if ( ( 'object' == typeof r ) && lastConfidentTime < settings.parsed.responses[0].supplemental.time ) {
</span><span class="cx"> // Set the total to the known good value (even if this value is a little old, newer values should only be a few less, and so shouldn't mess up the page links)
</span></span></pre></div>
<a id="trunkwpadminjseditcommentsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/edit-comments.js (11730 => 11731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/edit-comments.js 2009-07-20 04:35:11 UTC (rev 11730)
+++ trunk/wp-admin/js/edit-comments.js 2009-07-21 03:11:12 UTC (rev 11731)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var theList,theExtraList,toggleWithKeyboard=false;(function(a){setCommentsList=function(){var g,i,h,f=0,c,e,d,b;g=a('#comments-form .tablenav :input[name="_total"]');i=a('#comments-form .tablenav :input[name="_per_page"]');h=a('#comments-form .tablenav :input[name="_page"]');c=function(k,j){var l=a("#"+j.element);if(l.is(".unapproved")){l.find("div.comment_status").html("0")}else{l.find("div.comment_status").html("1")}a("span.pending-count").each(function(){var m=a(this),o;o=m.html().replace(/[ ,.]+/g,"");o=parseInt(o,10);if(isNaN(o)){return}o=o+(a("#"+j.element).is("."+j.dimClass)?1:-1);if(o<0){o=0}m.parents("#awaiting-mod")[0==o?"addClass":"removeClass"]("count-0");o=o.toString();if(o.length>3){o=o.substr(0,o.length-3)+" "+o.substr(-3)}m.html(o)})};e=function(j){j.data._total=g.val();j.data._per_page=i.val();j.data._page=h.val();j.data._url=document.location.href;if("undefined"!=showNotice&&j.data.action&&j.data.action=="delete-comment"&&!j.data.spam){return showNotice.warn()?j:false}return j};d=function(j,k,l){if(k<f){return}g.val(j.toString());if(l){f=k}a("span.total-type-count").each(function(){var m=a(this),o;o=g.val().toString();if(o.length>3){o=o.substr(0,o.length-3)+" "+o.substr(-3)}m.html(o)})};b=function(l,j){a("span.pending-count").each(function(){var m=a(this),o;o=m.html().replace(/[ ,.]+/g,"");o=parseInt(o,10);if(isNaN(o)){return}if(a("#"+j.element).is(".unapproved")){o=o-1}else{if(a(j.target).parents("span.unapprove").size()){o=o+1}}if(o<0){o=0}m.parents("#awaiting-mod")[0==o?"addClass":"removeClass"]("count-0");o=o.toString();if(o.length>3){o=o.substr(0,o.length-3)+" "+o.substr(-3)}m.html(o)});a("span.spam-count").each(function(){var m=a(this),o;o=m.html().replace(/[ ,.]+/g,"");o=parseInt(o,10);if(isNaN(o)){return}if(a(j.target).parents("span.spam").size()){o=o+1}else{if(a("#"+j.element).is(".spam")){o=o-1}}if(o<0){o=0}o=o.toString();if(o.length>3){o=o.substr(0,o.length-3)+" "+o.substr(-3)}m.html(o)});if(("object"==typeof l)&&f<j.parsed.responses[0].supplemental.time){d(j.parsed.responses[0].supplemental.total,j.parsed.responses[0].supplemental.time,true);if(a.trim(j.parsed.responses[0].supplemental.pageLinks)){a(".tablenav-pages").find(".page-numbers").remove().end().append(a(j.parsed.responses[0].supplemental.pageLinks))}else{if("undefined"!=typeof j.parsed.responses[0].supplemental.pageLinks){a(".tablenav-pages").find(".page-numbers").remove()}}}else{var k=parseInt(g.val(),10);if(k--<0){k=0}d(k,l,false)}if(theExtraList.size()==0||theExtraList.children().size()==0){return}theList.get(0).wpList.add(theExtraList.children(":eq(0)").remove().clone());a("#get-extra-comments").submit()};theExtraList=a("#the-extra-comment-list").wpList({alt:"",delColor:"none",addColor:"none"});theList=a("#the-comment-list").wpList({alt:"",delBefore:e,dimAfter:c,delAfter:b,addColor:"none"})};commentReply={init:function(){var b=a("#replyrow");a("a.cancel",b).click(function(){return commentReply.revert()});a("a.save",b).click(function(){return commentReply.send()});a("input#author, input#author-email, input#author-url",b).keypress(function(c){if(c.which==13){commentReply.send();c.preventDefault();return false}});a("#the-comment-list .column-comment > p").dblclick(function(){commentReply.toggle(a(this).parent())});a("#doaction, #doaction2, #post-query-submit").click(function(c){if(a("#the-comment-list #replyrow").length>0){commentReply.close()}});this.comments_listing=a('#comments-form > input[name="comment_status"]').val()||""},addEvents:function(b){b.each(function(){a(this).find(".column-comment > p").dblclick(function(){commentReply.toggle(a(this).parent())})})},toggle:function(b){if(a(b).css("display")!="none"){a(b).find("a.vim-q").click()}},revert:function(){if(a("#the-comment-list #replyrow").length<1){return false}a("#replyrow").fadeOut("fast",function(){commentReply.close()});return false},close:function(){a(this.o).fadeIn("fast").css("backgroundColor","");a("#com-reply").append(a("#replyrow"));a("#replycontent").val("");a("#edithead input").val("");a("#replysubmit .error").html("").hide();a("#replysubmit .waiting").hide();if(a.browser.msie){a("#replycontainer, #replycontent").css("height","120px")}else{a("#replycontainer").resizable("destroy").css("height","120px")}},open:function(i,g,c){var e=this,d,b,f;e.close();e.o="#comment-"+i;a("#replyrow td").attr("colspan",a(".widefat thead th:visible").length);d=a("#replyrow"),rowData=a("#inline-"+i);b=e.act=(c=="edit")?"edit-comment":"replyto-comment";a("#action",d).val(b);a("#comment_post_ID",d).val(g);a("#comment_ID",d).val(i);if(c=="edit"){a("#author",d).val(a("div.author",rowData).text());a("#author-email",d).val(a("div.author-email",rowData).text());a("#author-url",d).val(a("div.author-url",rowData).text());a("#status",d).val(a("div.comment_status",rowData).text());a("#replycontent",d).val(a("textarea.comment",rowData).val());a("#edithead, #savebtn",d).show();a("#replyhead, #replybtn",d).hide();f=a(e.o).height();if(f>220){if(a.browser.msie){a("#replycontainer, #replycontent",d).height(f-105)}else{a("#replycontainer",d).height(f-105)}}a(e.o).after(d.hide()).fadeOut("fast",function(){a("#replyrow").fadeIn("fast")})}else{a("#edithead, #savebtn",d).hide();a("#replyhead, #replybtn",d).show();a(e.o).after(d);a("#replyrow").hide().fadeIn("fast")}if(!a.browser.msie){a("#replycontainer").resizable({handles:"s",axis:"y",minHeight:80,stop:function(){a("#replycontainer").width("auto")}})}setTimeout(function(){var l,j,m,h,k;l=a("#replyrow").offset().top;j=l+a("#replyrow").height();m=window.pageYOffset||document.documentElement.scrollTop;h=document.documentElement.clientHeight||self.innerHeight||0;k=m+h;if(k-20<j){window.scroll(0,j-h+35)}else{if(l-20<m){window.scroll(0,l-35)}}a("#replycontent").focus().keyup(function(n){if(n.which==27){commentReply.revert()}})},600);return false},send:function(){var b={};a("#replysubmit .waiting").show();a("#replyrow input").each(function(){b[a(this).attr("name")]=a(this).val()});b.content=a("#replycontent").val();b.id=b.comment_post_ID;b.comments_listing=this.comments_listing;a.ajax({type:"POST",url:wpListL10n.url,data:b,success:function(c){commentReply.show(c)},error:function(c){commentReply.error(c)}});return false},show:function(b){var e,g,f,d;if(typeof(b)=="string"){this.error({responseText:b});return false}e=wpAjax.parseAjaxResponse(b);if(e.errors){this.error({responseText:wpAjax.broken});return false}if("edit-comment"==this.act){a(this.o).remove()}e=e.responses[0];g=e.data;a(g).hide();a("#replyrow").after(g);this.o=f="#comment-"+e.id;this.revert();this.addEvents(a(f));d=a(f).hasClass("unapproved")?"#ffffe0":"#fff";a(f).animate({backgroundColor:"#CCEEBB"},600).animate({backgroundColor:d},600);a.fn.wpList.process(a(f))},error:function(b){var c=b.statusText;a("#replysubmit .waiting").hide();if(b.responseText){c=b.responseText.replace(/<.[^<>]*?>/g,"")}if(c){a("#replysubmit .error").html(c).show()}}};a(document).ready(function(){var e,b,c,d;setCommentsList();commentReply.init();a("span.delete a.delete").click(function(){return false});if(typeof QTags!="undefined"){ed_reply=new QTags("ed_reply","replycontent","replycontainer","more")}if(typeof a.table_hotkeys!="undefined"){e=function(f){return function(){var h,g;h="next"==f?"first":"last";g=a("."+f+".page-numbers");if(g.length){window.location=g[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g,"")+"&hotkeys_highlight_"+h+"=1"}}};b=function(g,f){window.location=a("span.edit a",f).attr("href")};c=function(){toggleWithKeyboard=true;a("#comments-form thead #cb input:checkbox").click().attr("checked","");toggleWithKeyboard=false};d=function(f){return function(h,g){a("option[value="+f+"]").attr("selected","selected");a("form#comments-form")[0].submit()}};a.table_hotkeys(a("table.widefat"),["a","u","s","d","r","q",["e",b],["shift+a",d("approve")],["shift+s",d("markspam")],["shift+d",d("delete")],["shift+x",c],["shift+u",d("unapprove")]],{highlight_first:adminCommentsL10n.hotkeys_highlight_first,highlight_last:adminCommentsL10n.hotkeys_highlight_last,prev_page_link_cb:e("prev"),next_page_link_cb:e("next")})}})})(jQuery);
</del><span class="cx">\ No newline at end of file
</span><ins>+var theList,theExtraList,toggleWithKeyboard=false;(function(a){setCommentsList=function(){var g,i,h,f=0,c,e,d,b;g=a('#comments-form .tablenav :input[name="_total"]');i=a('#comments-form .tablenav :input[name="_per_page"]');h=a('#comments-form .tablenav :input[name="_page"]');c=function(k,j){var l=a("#"+j.element);if(l.is(".unapproved")){l.find("div.comment_status").html("0")}else{l.find("div.comment_status").html("1")}a("span.pending-count").each(function(){var m=a(this),o;o=m.html().replace(/[ ,.]+/g,"");o=parseInt(o,10);if(isNaN(o)){return}o=o+(a("#"+j.element).is("."+j.dimClass)?1:-1);if(o<0){o=0}m.parents("#awaiting-mod")[0==o?"addClass":"removeClass"]("count-0");o=o.toString();if(o.length>3){o=o.substr(0,o.length-3)+" "+o.substr(-3)}m.html(o)})};e=function(j){j.data._total=g.val();j.data._per_page=i.val();j.data._page=h.val();j.data._url=document.location.href;if("undefined"!=showNotice&&j.data.action&&j.data.action=="delete-comment"&&j.data.deleted){return showNotice.warn()?j:false}return j};d=function(j,k,l){if(k<f){return}g.val(j.toString());if(l){f=k}a("span.total-type-count").each(function(){var m=a(this),o;o=g.val().toString();if(o.length>3){o=o.substr(0,o.length-3)+" "+o.substr(-3)}m.html(o)})};b=function(l,j){a("span.pending-count").each(function(){var m=a(this),o;o=m.html().replace(/[ ,.]+/g,"");o=parseInt(o,10);if(isNaN(o)){return}if(a("#"+j.element).is(".unapproved")){o=o-1}else{if(a(j.target).parents("span.unapprove").size()){o=o+1}}if(o<0){o=0}m.parents("#awaiting-mod")[0==o?"addClass":"removeClass"]("count-0");o=o.toString();if(o.length>3){o=o.substr(0,o.length-3)+" "+o.substr(-3)}m.html(o)});a("span.spam-count").each(function(){var m=a(this),o;o=m.html().replace(/[ ,.]+/g,"");o=parseInt(o,10);if(isNaN(o)){return}if(a(j.target).parents("span.spam").size()){o=o+1}else{if(a("#"+j.element).is(".spam")){o=o-1}}if(o<0){o=0}o=o.toString();if(o.length>3){o=o.substr(0,o.length-3)+" "+o.substr(-3)}m.html(o)});a("span.deleted-count").each(function(){var m=a(this),o;o=m.html().replace(/[ ,.]+/g,"");o=parseInt(o,10);if(isNaN(o)){return}if(a(j.target).parents("span.delete").size()&&a("#"+j.element).is(".deleted,.spam")){o--}else{if(a(j.target).parents("span.delete").size()){o++}else{if(a("#"+j.element).is(".deleted")){o--}}}if(o<0){o=0}o=o.toString();if(o.length>3){o=o.substr(0,o.length-3)+" "+o.substr(-3)}m.html(o)});if(("object"==typeof l)&&f<j.parsed.responses[0].supplemental.time){d(j.parsed.responses[0].supplemental.total,j.parsed.responses[0].supplemental.time,true);if(a.trim(j.parsed.responses[0].supplemental.pageLinks)){a(".tablenav-pages").find(".page-numbers").remove().end().append(a(j.parsed.responses[0].supplemental.pageLinks))}else{if("undefined"!=typeof j.parsed.responses[0].supplemental.pageLinks){a(".tablenav-pages").find(".page-numbers").remove()}}}else{var k=parseInt(g.val(),10);if(k--<0){k=0}d(k,l,false)}if(theExtraList.size()==0||theExtraList.children().size()==0){return}theList.get(0).wpList.add(theExtraList.children(":eq(0)").remove().clone());a("#get-extra-comments").submit()};theExtraList=a("#the-extra-comment-list").wpList({alt:"",delColor:"none",addColor:"none"});theList=a("#the-comment-list").wpList({alt:"",delBefore:e,dimAfter:c,delAfter:b,addColor:"none"})};commentReply={init:function(){var b=a("#replyrow");a("a.cancel",b).click(function(){return commentReply.revert()});a("a.save",b).click(function(){return commentReply.send()});a("input#author, input#author-email, input#author-url",b).keypress(function(c){if(c.which==13){commentReply.send();c.preventDefault();return false}});a("#the-comment-list .column-comment > p").dblclick(function(){commentReply.toggle(a(this).parent())});a("#doaction, #doaction2, #post-query-submit").click(function(c){if(a("#the-comment-list #replyrow").length>0){commentReply.close()}});this.comments_listing=a('#comments-form > input[name="comment_status"]').val()||""},addEvents:function(b){b.each(function(){a(this).find(".column-comment > p").dblclick(function(){commentReply.toggle(a(this).parent())})})},toggle:function(b){if(a(b).css("display")!="none"){a(b).find("a.vim-q").click()}},revert:function(){if(a("#the-comment-list #replyrow").length<1){return false}a("#replyrow").fadeOut("fast",function(){commentReply.close()});return false},close:function(){a(this.o).fadeIn("fast").css("backgroundColor","");a("#com-reply").append(a("#replyrow"));a("#replycontent").val("");a("#edithead input").val("");a("#replysubmit .error").html("").hide();a("#replysubmit .waiting").hide();if(a.browser.msie){a("#replycontainer, #replycontent").css("height","120px")}else{a("#replycontainer").resizable("destroy").css("height","120px")}},open:function(i,g,c){var e=this,d,b,f;e.close();e.o="#comment-"+i;a("#replyrow td").attr("colspan",a(".widefat thead th:visible").length);d=a("#replyrow"),rowData=a("#inline-"+i);b=e.act=(c=="edit")?"edit-comment":"replyto-comment";a("#action",d).val(b);a("#comment_post_ID",d).val(g);a("#comment_ID",d).val(i);if(c=="edit"){a("#author",d).val(a("div.author",rowData).text());a("#author-email",d).val(a("div.author-email",rowData).text());a("#author-url",d).val(a("div.author-url",rowData).text());a("#status",d).val(a("div.comment_status",rowData).text());a("#replycontent",d).val(a("textarea.comment",rowData).val());a("#edithead, #savebtn",d).show();a("#replyhead, #replybtn",d).hide();f=a(e.o).height();if(f>220){if(a.browser.msie){a("#replycontainer, #replycontent",d).height(f-105)}else{a("#replycontainer",d).height(f-105)}}a(e.o).after(d.hide()).fadeOut("fast",function(){a("#replyrow").fadeIn("fast")})}else{a("#edithead, #savebtn",d).hide();a("#replyhead, #replybtn",d).show();a(e.o).after(d);a("#replyrow").hide().fadeIn("fast")}if(!a.browser.msie){a("#replycontainer").resizable({handles:"s",axis:"y",minHeight:80,stop:function(){a("#replycontainer").width("auto")}})}setTimeout(function(){var l,j,m,h,k;l=a("#replyrow").offset().top;j=l+a("#replyrow").height();m=window.pageYOffset||document.documentElement.scrollTop;h=document.documentElement.clientHeight||self.innerHeight||0;k=m+h;if(k-20<j){window.scroll(0,j-h+35)}else{if(l-20<m){window.scroll(0,l-35)}}a("#replycontent").focus().keyup(function(n){if(n.which==27){commentReply.revert()}})},600);return false},send:function(){var b={};a("#replysubmit .waiting").show();a("#replyrow input").each(function(){b[a(this).attr("name")]=a(this).val()});b.content=a("#replycontent").val();b.id=b.comment_post_ID;b.comments_listing=this.comments_listing;a.ajax({type:"POST",url:wpListL10n.url,data:b,success:function(c){commentReply.show(c)},error:function(c){commentReply.error(c)}});return false},show:function(b){var e,g,f,d;if(typeof(b)=="string"){this.error({responseText:b});return false}e=wpAjax.parseAjaxResponse(b);if(e.errors){this.error({responseText:wpAjax.broken});return false}if("edit-comment"==this.act){a(this.o).remove()}e=e.responses[0];g=e.data;a(g).hide();a("#replyrow").after(g);this.o=f="#comment-"+e.id;this.revert();this.addEvents(a(f));d=a(f).hasClass("unapproved")?"#ffffe0":"#fff";a(f).animate({backgroundColor:"#CCEEBB"},600).animate({backgroundColor:d},600);a.fn.wpList.process(a(f))},error:function(b){var c=b.statusText;a("#replysubmit .waiting").hide();if(b.responseText){c=b.responseText.replace(/<.[^<>]*?>/g,"")}if(c){a("#replysubmit .error").html(c).show()}}};a(document).ready(function(){var e,b,c,d;setCommentsList();commentReply.init();a("span.delete a.delete").click(function(){return false});if(typeof QTags!="undefined"){ed_reply=new QTags("ed_reply","replycontent","replycontainer","more")}if(typeof a.table_hotkeys!="undefined"){e=function(f){return function(){var h,g;h="next"==f?"first":"last";g=a("."+f+".page-numbers");if(g.length){window.location=g[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g,"")+"&hotkeys_highlight_"+h+"=1"}}};b=function(g,f){window.location=a("span.edit a",f).attr("href")};c=function(){toggleWithKeyboard=true;a("#comments-form thead #cb input:checkbox").click().attr("checked","");toggleWithKeyboard=false};d=function(f){return function(h,g){a("option[value="+f+"]").attr("selected","selected");a("form#comments-form")[0].submit()}};a.table_hotkeys(a("table.widefat"),["a","u","s","d","r","q",["e",b],["shift+a",d("approve")],["shift+s",d("markspam")],["shift+d",d("delete")],["shift+x",c],["shift+u",d("unapprove")]],{highlight_first:adminCommentsL10n.hotkeys_highlight_first,highlight_last:adminCommentsL10n.hotkeys_highlight_last,prev_page_link_cb:e("prev"),next_page_link_cb:e("next")})}})})(jQuery);
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminwpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/wp-admin.css (11730 => 11731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/wp-admin.css 2009-07-20 04:35:11 UTC (rev 11730)
+++ trunk/wp-admin/wp-admin.css 2009-07-21 03:11:12 UTC (rev 11731)
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.unapproved .approve, .spam .approve {
</del><ins>+.unapproved .approve, .spam .approve, .deleted .approve {
</ins><span class="cx"> display: inline;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (11730 => 11731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2009-07-20 04:35:11 UTC (rev 11730)
+++ trunk/wp-includes/comment.php 2009-07-21 03:11:12 UTC (rev 11731)
</span><span class="lines">@@ -208,6 +208,8 @@
</span><span class="cx"> $approved = "comment_approved = '1'";
</span><span class="cx"> elseif ( 'spam' == $status )
</span><span class="cx"> $approved = "comment_approved = 'spam'";
</span><ins>+ elseif ( 'deleted' == $status )
+ $approved = "comment_approved = 'deleted'";
</ins><span class="cx"> else
</span><span class="cx"> $approved = "( comment_approved = '0' OR comment_approved = '1' )";
</span><span class="cx">
</span><span class="lines">@@ -699,7 +701,7 @@
</span><span class="cx"> $count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A );
</span><span class="cx">
</span><span class="cx"> $total = 0;
</span><del>- $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam');
</del><ins>+ $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'deleted' => 'deleted');
</ins><span class="cx"> $known_types = array_keys( $approved );
</span><span class="cx"> foreach( (array) $count as $row_num => $row ) {
</span><span class="cx"> $total += $row['num_comments'];
</span><span class="lines">@@ -735,8 +737,13 @@
</span><span class="cx"> * @return bool False if delete comment query failure, true on success.
</span><span class="cx"> */
</span><span class="cx"> function wp_delete_comment($comment_id) {
</span><ins>+ if (wp_get_comment_status($comment_id) != 'deleted' && wp_get_comment_status($comment_id) != 'spam')
+ return wp_set_comment_status($comment_id, 'delete');
+
</ins><span class="cx"> global $wpdb;
</span><span class="cx"> do_action('delete_comment', $comment_id);
</span><ins>+
+ wp_unschedule_comment_destruction($comment_id);
</ins><span class="cx">
</span><span class="cx"> $comment = get_comment($comment_id);
</span><span class="cx">
</span><span class="lines">@@ -784,6 +791,8 @@
</span><span class="cx"> return 'unapproved';
</span><span class="cx"> elseif ( $approved == 'spam' )
</span><span class="cx"> return 'spam';
</span><ins>+ elseif ( $approved == 'deleted' )
+ return 'deleted';
</ins><span class="cx"> else
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -1028,7 +1037,8 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) {
</span><span class="cx"> global $wpdb;
</span><del>-
</del><ins>+ wp_unschedule_comment_destruction($comment_id);
+
</ins><span class="cx"> $status = '0';
</span><span class="cx"> switch ( $comment_status ) {
</span><span class="cx"> case 'hold':
</span><span class="lines">@@ -1045,7 +1055,10 @@
</span><span class="cx"> $status = 'spam';
</span><span class="cx"> break;
</span><span class="cx"> case 'delete':
</span><del>- return wp_delete_comment($comment_id);
</del><ins>+ if (wp_get_comment_status($comment_id) == 'deleted' || wp_get_comment_status($comment_id) == 'spam')
+ return wp_delete_comment($comment_id);
+ $status = 'deleted';
+ wp_schedule_comment_destruction($comment_id);
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="lines">@@ -1071,6 +1084,42 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Schedules a comment for destruction in 30 days.
+ *
+ * @since 2.9.0
+ *
+ * @param int $comment_id Comment ID.
+ * @return void
+ */
+function wp_schedule_comment_destruction($comment_id) {
+ $to_destroy = get_option('to_destroy');
+ if (!is_array($to_destroy))
+ $to_destroy = array();
+
+ $to_destroy['comments'][$comment_id] = time();
+
+ update_option('to_destroy', $to_destroy);
+}
+
+/**
+ * Unschedules a comment for destruction.
+ *
+ * @since 2.9.0
+ *
+ * @param int $comment_id Comment ID.
+ * @return void
+ */
+function wp_unschedule_comment_destruction($comment_id) {
+ $to_destroy = get_option('to_destroy');
+ if (!is_array($to_destroy))
+ return;
+
+ unset($to_destroy['comments'][$comment_id]);
+
+ update_option('to_destroy', $to_destroy);
+}
+
+/**
</ins><span class="cx"> * Updates an existing comment in the database.
</span><span class="cx"> *
</span><span class="cx"> * Filters the comment and makes sure certain fields are valid before updating.
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (11730 => 11731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2009-07-20 04:35:11 UTC (rev 11730)
+++ trunk/wp-includes/pluggable.php 2009-07-21 03:11:12 UTC (rev 11731)
</span><span class="lines">@@ -1767,4 +1767,32 @@
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><del>-?>
</del><ins>+/**
+ * Destroys comments which have previously been scheduled for destruction.
+ * Will do the same for posts, pages, etc in the future.
+ *
+ * @access private
+ * @since 2.9.0
+ *
+ * @return void
+ */
+function _scheduled_destruction() {
+ $to_destroy = get_option('to_destroy');
+ if (!is_array($to_destroy))
+ return;
+
+ $deletetimestamp = time()-(60*60*24*30);
+ foreach ($to_destroy['comments'] as $comment_id => $timestamp) {
+ if ($timestamp < $deletetimestamp) {
+ wp_delete_comment($comment_id);
+ unset($to_destroy['comments'][$comment_id]);
+ }
+ }
+
+ update_option('to_destroy', $to_destroy);
+}
+add_action( '_scheduled_destruction', '_scheduled_destruction' );
+if ( !wp_next_scheduled('_scheduled_destruction') && !defined('WP_INSTALLING') )
+ wp_schedule_event(time(), 'daily', '_scheduled_destruction');
+
+
</ins></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (11730 => 11731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2009-07-20 04:35:11 UTC (rev 11730)
+++ trunk/wp-includes/script-loader.php 2009-07-21 03:11:12 UTC (rev 11731)
</span><span class="lines">@@ -60,10 +60,10 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20090102' );
</span><span class="cx">
</span><del>- $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20090623' );
</del><ins>+ $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20090720' );
</ins><span class="cx"> $scripts->add_data( 'common', 'group', 1 );
</span><span class="cx"> $scripts->localize( 'common', 'commonL10n', array(
</span><del>- 'warnDelete' => __("You are about to delete the selected items.\n 'Cancel' to stop, 'OK' to delete."),
</del><ins>+ 'warnDelete' => __("You are about to permanently delete the selected items.\n 'Cancel' to stop, 'OK' to delete."),
</ins><span class="cx"> 'l10n_print_after' => 'try{convertEntities(commonL10n);}catch(e){};'
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array('jquery'), '20090514' );
</span><span class="cx"> $scripts->add_data( 'user-profile', 'group', 1 );
</span><span class="cx">
</span><del>- $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20090627' );
</del><ins>+ $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20090720' );
</ins><span class="cx"> $scripts->add_data( 'admin-comments', 'group', 1 );
</span><span class="cx"> $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
</span><span class="cx"> 'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
</span><span class="lines">@@ -426,9 +426,9 @@
</span><span class="cx"> $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' );
</span><span class="cx">
</span><span class="cx"> // all colors stylesheets need to have the same query strings (cache manifest compat)
</span><del>- $colors_version = '20090625';
</del><ins>+ $colors_version = '20090720';
</ins><span class="cx">
</span><del>- $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090625' );
</del><ins>+ $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090720' );
</ins><span class="cx"> $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' );
</span><span class="cx">
</span><span class="cx"> $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20090630' );
</span></span></pre>
</div>
</div>
</body>
</html>