Ticket #4529: delete-comment.10.diff

Index: wp-includes/comment.php
===================================================================
--- wp-includes/comment.php     (revision 11710)
+++ wp-includes/comment.php     (working copy)
@@ -208,6 +208,8 @@
                $approved = "comment_approved = '1'";
        elseif ( 'spam' == $status )
                $approved = "comment_approved = 'spam'";
+       elseif ( 'deleted' == $status )
+               $approved = "comment_approved = 'deleted'";
        else
                $approved = "( comment_approved = '0' OR comment_approved = '1' )";
 
@@ -699,7 +701,7 @@
        $count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A );
 
        $total = 0;
-       $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam');
+       $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'deleted' => 'deleted');
        $known_types = array_keys( $approved );
        foreach( (array) $count as $row_num => $row ) {
                $total += $row['num_comments'];
@@ -735,8 +737,13 @@
  * @return bool False if delete comment query failure, true on success.
  */
 function wp_delete_comment($comment_id) {
+       if (wp_get_comment_status($comment_id) != 'deleted' && wp_get_comment_status($comment_id) != 'spam')
+               return wp_set_comment_status($comment_id, 'delete');
+       
        global $wpdb;
        do_action('delete_comment', $comment_id);
+       
+       wp_unschedule_comment_destruction($comment_id);
 
        $comment = get_comment($comment_id);
 
@@ -784,6 +791,8 @@
                return 'unapproved';
        elseif ( $approved == 'spam' )
                return 'spam';
+       elseif ( $approved == 'deleted' )
+               return 'deleted';
        else
                return false;
 }
@@ -1028,7 +1037,8 @@
  */
 function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) {
        global $wpdb;
-
+       wp_unschedule_comment_destruction($comment_id);
+       
        $status = '0';
        switch ( $comment_status ) {
                case 'hold':
@@ -1045,7 +1055,10 @@
                        $status = 'spam';
                        break;
                case 'delete':
-                       return wp_delete_comment($comment_id);
+                       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);
                        break;
                default:
                        return false;
@@ -1071,6 +1084,42 @@
 }
 
 /**
+ * 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);
+}
+
+/**
  * Updates an existing comment in the database.
  *
  * Filters the comment and makes sure certain fields are valid before updating.
Index: wp-includes/pluggable.php
===================================================================
--- wp-includes/pluggable.php   (revision 11710)
+++ wp-includes/pluggable.php   (working copy)
@@ -1767,4 +1767,32 @@
 }
 endif;
 
+/**
+ * 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');
+
 ?>
Index: wp-includes/script-loader.php
===================================================================
--- wp-includes/script-loader.php       (revision 11710)
+++ wp-includes/script-loader.php       (working copy)
@@ -63,7 +63,7 @@
        $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20090623' );
        $scripts->add_data( 'common', 'group', 1 );
        $scripts->localize( 'common', 'commonL10n', array(
-               'warnDelete' => __("You are about to delete the selected items.\n  'Cancel' to stop, 'OK' to delete."),
+               'warnDelete' => __("You are about to permanently delete the selected items.\n  'Cancel' to stop, 'OK' to delete."),
                'l10n_print_after' => 'try{convertEntities(commonL10n);}catch(e){};'
        ) );
 
Index: wp-admin/edit-comments.php
===================================================================
--- wp-admin/edit-comments.php  (revision 11710)
+++ wp-admin/edit-comments.php  (working copy)
@@ -14,32 +14,36 @@
 
 $post_id = isset($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0;
 
-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'] ) ) {
+if ( isset($_REQUEST['doaction']) ||  isset($_REQUEST['doaction2']) || isset($_REQUEST['destroy_all']) || isset($_REQUEST['destroy_all2']) ) {
        check_admin_referer('bulk-comments');
-       $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;
+       
+       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
                $_post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment_id) );
 
                if ( !current_user_can('edit_post', $_post_id) )
                        continue;
 
                switch( $doaction ) {
+                       case 'approve' :
+                               wp_set_comment_status($comment_id, 'approve');
+                               $approved++;
+                               break;
+                       case 'unapprove' :
+                               wp_set_comment_status($comment_id, 'hold');
+                               $unapproved++;
+                               break;
                        case 'markspam' :
                                wp_set_comment_status($comment_id, 'spam');
                                $spammed++;
@@ -48,18 +52,14 @@
                                wp_set_comment_status($comment_id, 'delete');
                                $deleted++;
                                break;
-                       case 'approve' :
-                               wp_set_comment_status($comment_id, 'approve');
-                               $approved++;
+                       case 'destroy' :
+                               wp_set_comment_status($comment_id, 'delete');
+                               $destroyed++;
                                break;
-                       case 'unapprove' :
-                               wp_set_comment_status($comment_id, 'hold');
-                               $unapproved++;
-                               break;
                }
-       endforeach;
+       }
 
-       $redirect_to = 'edit-comments.php?deleted=' . $deleted . '&approved=' . $approved . '&spam=' . $spammed . '&unapproved=' . $unapproved;
+       $redirect_to = 'edit-comments.php?approved=' . $approved . '&unapproved=' . $unapproved . '&spam=' . $spammed . '&deleted=' . $deleted . '&destroyed=' . $destroyed;
        if ( $post_id )
                $redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to );
        if ( isset($_REQUEST['apage']) )
@@ -86,7 +86,7 @@
 $mode = ( ! isset($_GET['mode']) || empty($_GET['mode']) ) ? 'detail' : esc_attr($_GET['mode']);
 
 $comment_status = isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all';
-if ( !in_array($comment_status, array('all', 'moderated', 'approved', 'spam')) )
+if ( !in_array($comment_status, array('all', 'moderated', 'approved', 'spam', 'deleted')) )
        $comment_status = 'all';
 
 $comment_type = !empty($_GET['comment_type']) ? esc_attr($_GET['comment_type']) : '';
@@ -102,26 +102,29 @@
 </h2>
 
 <?php
-if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['spam'] ) ) {
+if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['destroyed'] ) || isset( $_GET['spam'] ) ) {
        $approved = isset( $_GET['approved'] ) ? (int) $_GET['approved'] : 0;
        $deleted = isset( $_GET['deleted'] ) ? (int) $_GET['deleted'] : 0;
+       $destroyed = isset( $_GET['destroyed'] ) ? (int) $_GET['destroyed'] : 0;
        $spam = isset( $_GET['spam'] ) ? (int) $_GET['spam'] : 0;
 
-       if ( $approved > 0 || $deleted > 0 || $spam > 0 ) {
+       if ( $approved > 0 || $deleted > 0 || $destroyed > 0 || $spam > 0 ) {
                echo '<div id="moderated" class="updated fade"><p>';
 
                if ( $approved > 0 ) {
                        printf( _n( '%s comment approved', '%s comments approved', $approved ), $approved );
                        echo '<br />';
                }
-
+               if ( $spam > 0 ) {
+                       printf( _n( '%s comment marked as spam', '%s comments marked as spam', $spam ), $spam );
+                       echo '<br />';
+               }
                if ( $deleted > 0 ) {
                        printf( _n( '%s comment deleted', '%s comments deleted', $deleted ), $deleted );
                        echo '<br />';
                }
-
-               if ( $spam > 0 ) {
-                       printf( _n( '%s comment marked as spam', '%s comments marked as spam', $spam ), $spam );
+               if ( $destroyed > 0 ) {
+                       printf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $destroyed ), $destroyed );
                        echo '<br />';
                }
 
@@ -139,9 +142,10 @@
 //, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
 $stati = array(
                'all' => _n_noop('All', 'All'), // singular not used
-               'moderated' => _n_noop('Pending (<span class="pending-count">%s</span>)', 'Pending (<span class="pending-count">%s</span>)'),
+               '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>'),
                'approved' => _n_noop('Approved', 'Approved'), // singular not used
-               'spam' => _n_noop('Spam (<span class="spam-count">%s</span>)', 'Spam (<span class="spam-count">%s</span>)')
+               '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('Deleted <span class="count">(<span class="deleted-count">%s</span>)</span>', 'Deleted <span class="count">(<span class="deleted-count">%s</span>)</span>')
        );
 $link = 'edit-comments.php';
 if ( !empty($comment_type) && 'all' != $comment_type )
@@ -246,13 +250,17 @@
 <?php if ( 'all' == $comment_status || 'approved' == $comment_status ): ?>
 <option value="unapprove"><?php _e('Unapprove'); ?></option>
 <?php endif; ?>
-<?php if ( 'all' == $comment_status || 'moderated' == $comment_status || 'spam' == $comment_status ): ?>
+<?php if ( 'approved' != $comment_status ): ?>
 <option value="approve"><?php _e('Approve'); ?></option>
 <?php endif; ?>
 <?php if ( 'spam' != $comment_status ): ?>
 <option value="markspam"><?php _e('Mark as Spam'); ?></option>
 <?php endif; ?>
+<?php if ( 'deleted' == $comment_status || 'spam' == $comment_status ): ?>
+<option value="destroy"><?php _e('Delete Permanently'); ?></option>
+<?php else: ?>
 <option value="delete"><?php _e('Delete'); ?></option>
+<?php endif; ?>
 </select>
 <input type="submit" name="doaction" id="doaction" value="<?php esc_attr_e('Apply'); ?>" class="button-secondary apply" />
 <?php wp_nonce_field('bulk-comments'); ?>
@@ -278,11 +286,11 @@
        <input type="hidden" name="apage" value="<?php echo esc_attr( absint( $_GET['apage'] ) ); ?>" />
 <?php }
 
-if ( 'spam' == $comment_status ) {
-       wp_nonce_field('bulk-spam-delete', '_spam_nonce');
+if ( 'spam' == $comment_status || 'deleted' == $comment_status ) {
+       wp_nonce_field('bulk-destroy', '_destroy_nonce');
         if ( current_user_can ('moderate_comments')) { ?>
-               <input type="submit" name="delete_all_spam" value="<?php esc_attr_e('Delete All Spam'); ?>" class="button-secondary apply" />
-<?php  }
+               <input type="submit" name="destroy_all" id="destroy_all" value="<?php esc_attr_e('Permanently Delete All'); ?>" class="button-secondary apply" />
+<?php }
 } ?>
 <?php do_action('manage_comments_nav', $comment_status); ?>
 </div>
@@ -333,18 +341,22 @@
 <?php if ( 'all' == $comment_status || 'approved' == $comment_status ): ?>
 <option value="unapprove"><?php _e('Unapprove'); ?></option>
 <?php endif; ?>
-<?php if ( 'all' == $comment_status || 'moderated' == $comment_status || 'spam' == $comment_status ): ?>
+<?php if ( 'approved' != $comment_status ): ?>
 <option value="approve"><?php _e('Approve'); ?></option>
 <?php endif; ?>
 <?php if ( 'spam' != $comment_status ): ?>
 <option value="markspam"><?php _e('Mark as Spam'); ?></option>
 <?php endif; ?>
+<?php if ( 'deleted' == $comment_status || 'spam' == $comment_status ): ?>
+<option value="destroy"><?php _e('Delete Permanently'); ?></option>
+<?php else: ?>
 <option value="delete"><?php _e('Delete'); ?></option>
+<?php endif; ?>
 </select>
 <input type="submit" name="doaction2" id="doaction2" value="<?php esc_attr_e('Apply'); ?>" class="button-secondary apply" />
 
-<?php if ( 'spam' == $comment_status ) { ?>
-<input type="submit" name="delete_all_spam2" value="<?php esc_attr_e('Delete All Spam'); ?>" class="button-secondary apply" />
+<?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" />
 <?php } ?>
 <?php do_action('manage_comments_nav', $comment_status); ?>
 </div>
Index: wp-admin/admin-ajax.php
===================================================================
--- wp-admin/admin-ajax.php     (revision 11710)
+++ wp-admin/admin-ajax.php     (working copy)
@@ -192,7 +192,7 @@
                        die( (string) time() );
                $r = wp_set_comment_status( $comment->comment_ID, 'spam' );
        } else {
-               $r = wp_delete_comment( $comment->comment_ID );
+               $r = wp_set_comment_status( $comment->comment_ID, 'delete' );
        }
        if ( $r ) // Decide if we need to send back '1' or a more complicated response including page links and comment counts
                _wp_ajax_delete_comment_response( $comment->comment_ID );
@@ -336,7 +336,7 @@
                die( (string) time() );
 
        $r = 0;
-       if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
+       if ( in_array( $current, array( 'unapproved', 'spam', 'deleted' ) ) ) {
                check_ajax_referer( "approve-comment_$id" );
                $result = wp_set_comment_status( $comment->comment_ID, 'approve', true );
        } else {
Index: wp-admin/wp-admin.css
===================================================================
--- wp-admin/wp-admin.css       (revision 11710)
+++ wp-admin/wp-admin.css       (working copy)
@@ -444,7 +444,7 @@
        display: none;
 }
 
-.unapproved .approve, .spam .approve {
+.unapproved .approve, .spam .approve, .deleted .approve {
        display: inline;
 }
 
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php      (revision 11710)
+++ wp-admin/includes/template.php      (working copy)
@@ -2009,6 +2009,9 @@
        } elseif ( 'spam' == $status ) {
                $approved = "comment_approved = 'spam'";
                $total = $count->spam;
+       } elseif ( 'deleted' == $status ) {
+               $approved = "comment_approved = 'deleted'";
+               $total = $count->deleted;
        } else {
                $approved = "( comment_approved = '0' OR comment_approved = '1' )";
                $total = $count->moderated + $count->approved;
@@ -2148,10 +2151,13 @@
                                        }
                                        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>';
+                                       if ( 'deleted' == $the_comment_status || '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>';
+                                       else
+                                               $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 )
+                                       if ( 'spam' != $the_comment_status && 'deleted' != $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>';
 
                                        $actions = apply_filters( 'comment_row_actions', $actions, $comment );
Index: wp-admin/js/common.dev.js
===================================================================
--- wp-admin/js/common.dev.js   (revision 11710)
+++ wp-admin/js/common.dev.js   (working copy)
@@ -156,10 +156,13 @@
 
        // show warnings
        $('#doaction, #doaction2').click(function(){
-               if ( $('select[name="action"]').val() == 'delete' || $('select[name="action2"]').val() == 'delete' ) {
+               if ( $('select[name="action"]').val() == 'destroy' || $('select[name="action2"]').val() == 'destroy' ) {
                        return showNotice.warn();
                }
        });
+       $('#destroy_all, #destroy_all2').click(function(){
+               return showNotice.warn();
+       });
 
        // screen settings tab
        $('#show-settings-link').click(function () {
Index: wp-admin/js/edit-comments.dev.js
===================================================================
--- wp-admin/js/edit-comments.dev.js    (revision 11710)
+++ wp-admin/js/edit-comments.dev.js    (working copy)
@@ -38,7 +38,7 @@
                settings.data._page = pageInput.val();
                settings.data._url = document.location.href;
 
-               if ( 'undefined' != showNotice && settings.data.action && settings.data.action == 'delete-comment' && !settings.data.spam )
+               if ( 'undefined' != showNotice && settings.data.action && settings.data.action == 'delete-comment' && settings.data.deleted)
                        return showNotice.warn() ? settings : false;
 
                return settings;
@@ -91,7 +91,7 @@
                        if ( isNaN(n) ) return;
                        if ( $(settings.target).parents( 'span.spam' ).size() ) { // we marked a comment as spam
                                n = n + 1;
-                       } else if ( $('#' + settings.element).is('.spam') ) { // we approved or deleted a comment marked as spam
+                       } else if ( $('#' + settings.element).is('.spam') ) { // we approved, deleted, or destroyed a comment marked as spam
                                n = n - 1;
                        }
                        if ( n < 0 ) { n = 0; }
@@ -101,7 +101,26 @@
                        a.html(n);
                });
 
+               $('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);
+               });
 
+
                // XML response
                if ( ( 'object' == typeof r ) && lastConfidentTime < settings.parsed.responses[0].supplemental.time ) {
                        // 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)
Index: wp-admin/edit-form-comment.php
===================================================================
--- wp-admin/edit-form-comment.php      (revision 11710)
+++ wp-admin/edit-form-comment.php      (working copy)
@@ -38,19 +38,24 @@
 <div class="submitbox" id="submitcomment">
 <div id="minor-publishing">
 
+<?php if ($comment->comment_approved == '1') { ?>
 <div id="minor-publishing-actions">
 <div id="preview-action">
 <a class="preview button" href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View Comment'); ?></a>
 </div>
 <div class="clear"></div>
 </div>
+<?php } ?>
 
 <div id="misc-publishing-actions">
 
 <div class="misc-pub-section" id="comment-status-radio">
 <label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php /* translators: comment type radio button */ echo _x('Approved', 'adjective') ?></label><br />
 <label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php /* translators: comment type radio button */ echo _x('Pending', 'adjective') ?></label><br />
-<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php /* translators: comment type radio button */ echo _x('Spam', 'adjective'); ?></label>
+<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php /* translators: comment type radio button */ echo _x('Spam', 'adjective'); ?></label><br />
+<?php if ($comment->comment_approved == 'deleted') { ?>
+<label class="deleted"><input type="radio"<?php checked( $comment->comment_approved, 'deleted' ); ?> name="comment_status" value="deleted" /><?php /* translators: comment type radio button */ echo _x('Deleted', 'adjective'); ?></label>
+<?php } ?>
 </div>
 
 <div class="misc-pub-section curtime misc-pub-section-last">
@@ -69,7 +74,12 @@
 
 <div id="major-publishing-actions">
 <div id="delete-action">
-<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . esc_js(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ){return true;}return false;\">" . __('Delete') . "</a>\n"; ?>
+<?php
+if ($comment->comment_approved == 'deleted')
+       echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . esc_js(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ){return true;}return false;\">" . __('Delete Permanently') . "</a>\n";
+else
+       echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "'>" . __('Delete') . "</a>\n";
+?>
 </div>
 <div id="publishing-action">
 <input type="submit" name="save" value="<?php esc_attr_e('Update Comment'); ?>" tabindex="4" class="button-primary" />
Index: wp-admin/css/colors-fresh.css
===================================================================
--- wp-admin/css/colors-fresh.css       (revision 11710)
+++ wp-admin/css/colors-fresh.css       (working copy)
@@ -58,7 +58,8 @@
        border-color: #ccc;
 }
 
-#poststuff .inside label.spam {
+#poststuff .inside label.spam,
+#poststuff .inside label.deleted {
        color: red;
 }
 
Index: wp-admin/css/colors-classic.css
===================================================================
--- wp-admin/css/colors-classic.css     (revision 11710)
+++ wp-admin/css/colors-classic.css     (working copy)
@@ -58,7 +58,8 @@
        border-color: #ccc;
 }
 
-#poststuff .inside label.spam {
+#poststuff .inside label.spam,
+#poststuff .inside label.deleted {
        color: red;
 }