Ticket #4529: delete-comment.diff

wp-admin/edit-comments.php

@@ -100 +100 @@
 $stati = array(
                 'moderated' => sprintf(__ngettext('Awaiting Moderation (%s)', 'Awaiting Moderation (%s)', number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"),
                 'approved' => _c('Approved|plural'),
-                'spam' => sprintf(__ngettext('Spam (%s)', 'Spam (%s)', number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
+                'spam' => sprintf(__ngettext('Spam (%s)', 'Spam (%s)', number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>"),
+                'deleted' => sprintf(__ngettext('Deleted (%s)', 'Deleted (%s)', number_format_i18n($num_comments->deleted) ), "<span class='deleted-comment-count'>" . number_format_i18n($num_comments->deleted) . "</span>")
         );
 $class = ( '' === $comment_status ) ? ' class="current"' : '';
 $status_links[] = "<li><a href=\"edit-comments.php\"$class>".__('Show All Comments')."</a>";
@@ -183 +184 @@
 <?php if ( 'spam' != $comment_status ): ?>
 <option value="markspam"><?php _e('Mark as Spam'); ?></option>
 <?php endif; ?>
+<?php if ( 'deleted' != $comment_status ): ?>
 <option value="delete"><?php _e('Delete'); ?></option>
+<?php else : ?>
+<option value="delete"><?php _e('Delete Permenantly'); ?></option>
+<?php endif; ?>
 </select>
 <input type="submit" name="doaction" value="Apply" class="button-secondary apply" />
 <?php do_action('manage_comments_nav', $comment_status); ?>

wp-admin/admin-ajax.php

@@ -182 +182 @@
         if ( $_POST['new'] == $current )
                 die('1');
 
-        if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
+        if ( in_array( $current, array( 'unapproved', 'spam', 'deleted' ) ) ) {
                 check_ajax_referer( "approve-comment_$id" );
                 if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )
                         die('1');

wp-admin/wp-admin.css

@@ -249 +249 @@
         display: none;
 }
 
-.unapproved .approve, .spam .approve {
+.unapproved .approve, .spam .approve, .deleted .approve {
         display: inline;
 }
 

wp-admin/includes/template.php

@@ -948 +948 @@
                 $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' )";
 
@@ -1021 +1023 @@
                 $actions['edit']      = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a> | ';
                 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' ) . "'>" . __( 'Spam' ) . '</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 )
+                        $actions['delete']    = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID 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>';
 
                 if ( $comment_status ) { // not looking at all comments
                         if ( 'approved' == $the_comment_status ) {
@@ -1033 +1038 @@
                         }
                 }
 
-                if ( 'spam' != $the_comment_status )
+                if ( 'spam' != $the_comment_status && 'deleted' != $the_comment_status )
                         $actions['reply'] = '<span class="hide-if-no-js"> | <a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',this);return false;" class="vim-r" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a></span>';
 
                 $actions = apply_filters( 'comment_row_actions', $actions, $comment );

wp-admin/js/edit-comments.js

@@ -67 +67 @@
                         if ( n < 0 ) { n = 0; }
                         a.html( n.toString() );
                 });
+                $('li span.deleted-comment-count' ).each( function() {
+                        var a = $(this);
+                        var n = parseInt(a.html(),10);
+                        if ( $(settings.target).parents( 'span.delete' ).size() && !$('#' + settings.element).is('.deleted') ) { // we deleted a comment
+                                n = n + 1;
+                        } else if ( $('#' + settings.element).is('.deleted') ) { // we approved or deleted a deleted comment
+                                n = n - 1;
+                        }
+                        if ( n < 0 ) { n = 0; }
+                        a.html( n.toString() );
+                });
         
                 if ( theExtraList.size() == 0 || theExtraList.children().size() == 0 ) {
                         return;

wp-includes/comment.php

@@ -540 +540 @@
 
         $total = 0;
         $stats = array( );
-        $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam');
+        $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'deleted' => 'deleted');
         foreach( (array) $count as $row_num => $row ) {
                 $total += $row['num_comments'];
                 $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
@@ -578 +578 @@
 
         $comment = get_comment($comment_id);
 
-        if ( ! $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id) ) )
-                return false;
+        if ($comment->comment_approved == 'deleted')
+                return $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id) );
+        else
+                return $wpdb->query( $wpdb->prepare("UPDATE $wpdb->comments SET comment_approved='deleted' WHERE comment_ID = %d LIMIT 1", $comment_id) );
+//      if ( ! $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id) ) )
+//      if ( ! $wpdb->query( $wpdb->prepare("UPDATE $wpdb->comments SET comment_approved='deleted' WHERE comment_ID = %d LIMIT 1", $comment_id) ) )
+//              return false;
 
         $post_id = $comment->comment_post_ID;
         if ( $post_id && $comment->comment_approved == 1 )
@@ -614 +619 @@
                 return 'unapproved';
         elseif ( $approved == 'spam' )
                 return 'spam';
+        elseif ( $approved == 'deleted' )
+                return 'deleted';
         else
                 return false;
 }