Changeset 3529 for trunk/wp-admin/post.php

Timestamp:

02/14/2006 08:09:13 PM (19 years ago)

Author:

ryan

Message:

Option to 'mark as spam' in notification e-mail from Mark J. fixes #1048

File:

• trunk/wp-admin/post.php (modified) (3 diffs)

trunk/wp-admin/post.php

@@ -185 +185 @@
 
     echo "<div class='wrap'>\n";
-    echo "<p>" . __('<strong>Caution:</strong> You are about to delete the following comment:') . "</p>\n";
+    if ( 'spam' == $_GET['delete_type'] )
+        echo "<p>" . __('<strong>Caution:</strong> You are about to mark the following comment as spam:') . "</p>\n";
+    else
+        echo "<p>" . __('<strong>Caution:</strong> You are about to delete the following comment:') . "</p>\n";
     echo "<table border='0'>\n";
     echo "<tr><td>" . __('Author:') . "</td><td>$comment->comment_author</td></tr>\n";
@@ -196 +199 @@
     echo "<form action='".get_settings('siteurl')."/wp-admin/post.php' method='get'>\n";
     echo "<input type='hidden' name='action' value='deletecomment' />\n";
+    if ( 'spam' == $_GET['delete_type'] )
+        echo "<input type='hidden' name='delete_type' value='spam' />\n";
     echo "<input type='hidden' name='p' value='$p' />\n";
     echo "<input type='hidden' name='comment' value='{$comment->comment_ID}' />\n";
@@ -227 +232 @@
         die( __('You are not allowed to edit comments on this post.') );
 
-    wp_set_comment_status($comment->comment_ID, "delete");
-    do_action('delete_comment', $comment->comment_ID);
+    if ( 'spam' == $_GET['delete_type'] )
+        wp_set_comment_status($comment->comment_ID, 'spam');
+    else
+        wp_delete_comment($comment->comment_ID);
 
     if (($_SERVER['HTTP_REFERER'] != "") && (false == $noredir)) {