Changeset 11731 for trunk/wp-includes/comment.php

Timestamp:

07/21/2009 03:11:12 AM (17 years ago)

Author:

azaozz

Message:

"Trash" status for comments, first run, props caesarsgrunt, see #4529

File:

• trunk/wp-includes/comment.php (modified) (7 diffs)

trunk/wp-includes/comment.php

@@ -209 +209 @@
     elseif ( 'spam' == $status )
         $approved = "comment_approved = 'spam'";
+    elseif ( 'deleted' == $status )
+        $approved = "comment_approved = 'deleted'";
     else
         $approved = "( comment_approved = '0' OR comment_approved = '1' )";
@@ -700 +702 @@
 
     $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 ) {
@@ -736 +738 @@
  */
 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);
@@ -785 +792 @@
     elseif ( $approved == 'spam' )
         return 'spam';
+    elseif ( $approved == 'deleted' )
+        return 'deleted';
     else
         return false;
@@ -1029 +1038 @@
 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 ) {
@@ -1046 +1056 @@
             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:
@@ -1069 +1082 @@
 
     return true;
+}
+
+/**
+ * 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);
 }