Ticket #11426: 11426.diff

wp-admin/comment.php

@@ -76 +76 @@
 if ( 'spam' == $_GET['dt'] ) {
         $caution_msg = __('You are about to mark the following comment as spam:');
         $button = __('Spam Comment');
+} elseif ( 'trash' == $_GET['dt'] ) {
+        $caution_msg = __('You are about to move the following comment to the Trash:');
+        $button = __('Trash Comment');
 } elseif ( 'cdc' == $action ) {
         $caution_msg = __('You are about to delete the following comment:');
         $button = __('Delete Comment');
@@ -102 +105 @@
 <input type='hidden' name='action' value='<?php echo esc_attr($formaction); ?>' />
 <?php if ( 'spam' == $_GET['dt'] ) { ?>
 <input type='hidden' name='dt' value='spam' />
+<?php } elseif ( 'trash' == $_GET['dt'] ) { ?>
+<input type='hidden' name='dt' value='trash' />
 <?php } ?>
 <input type='hidden' name='p' value='<?php echo esc_attr($comment->comment_post_ID); ?>' />
 <input type='hidden' name='c' value='<?php echo esc_attr($comment->comment_ID); ?>' />
@@ -152 +157 @@
                 comment_footer_die( __('You are not allowed to edit comments on this post.') );
 
         if ( 'spam' == $_REQUEST['dt'] )
-                wp_set_comment_status( $comment->comment_ID, 'spam' );
+                wp_spam_comment( $comment->comment_ID );
+        elseif ( 'trash' == $_REQUEST['dt'] )
+                wp_trash_comment( $comment->comment_ID );
         else
                 wp_delete_comment( $comment->comment_ID );
 

wp-includes/pluggable.php

@@ -1017 +1017 @@
                 $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title );
         }
         $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
-        $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=cdc&c=$comment_id") ) . "\r\n";
+        if ( EMPTY_TRASH_DAYS )
+                $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=cdc&dt=trash&c=$comment_id") ) . "\r\n";
+        else
+                $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=cdc&c=$comment_id") ) . "\r\n";
         $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=cdc&dt=spam&c=$comment_id") ) . "\r\n";
 
         $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
@@ -1102 +1105 @@
         }
 
         $notify_message .= sprintf( __('Approve it: %s'),  admin_url("comment.php?action=mac&c=$comment_id") ) . "\r\n";
-        $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=cdc&c=$comment_id") ) . "\r\n";
+        if ( EMPTY_TRASH_DAYS )
+                $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=cdc&dt=trash&c=$comment_id") ) . "\r\n";
+        else
+                $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=cdc&c=$comment_id") ) . "\r\n";
         $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=cdc&dt=spam&c=$comment_id") ) . "\r\n";
 
         $notify_message .= sprintf( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:',