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

Timestamp:

07/24/2009 07:23:11 AM (17 years ago)

Author:

azaozz

Message:

"Trash" status for comments updates, props caesarsgrunt, see #4529

File:

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

trunk/wp-includes/comment.php

@@ -744 +744 @@
     do_action('delete_comment', $comment_id);
     
-    wp_unschedule_comment_destruction($comment_id);
+    wp_unschedule_comment_delete($comment_id);
 
     $comment = get_comment($comment_id);
@@ -1038 +1038 @@
 function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) {
     global $wpdb;
-    wp_unschedule_comment_destruction($comment_id);
+    wp_unschedule_comment_delete($comment_id);
     
     $status = '0';
@@ -1059 +1059 @@
                 return wp_delete_comment($comment_id);
             $status = 'deleted';
-            wp_schedule_comment_destruction($comment_id);
+            wp_schedule_comment_delete($comment_id);
             break;
         default:
@@ -1092 +1092 @@
  * @return void
  */
-function wp_schedule_comment_destruction($comment_id) {
-    $to_destroy = get_option('to_destroy');
-    if (!is_array($to_destroy))
-        $to_destroy = array();
+function wp_schedule_comment_delete($comment_id) {
+    $to_delete = get_option('wp_scheduled_delete');
+    if ( !is_array($to_delete) )
+        $to_delete = array();
     
-    $to_destroy['comments'][$comment_id] = time();
+    $to_delete['comments'][$comment_id] = time();
     
-    update_option('to_destroy', $to_destroy);
+    update_option('wp_scheduled_delete', $to_delete);
 }
 
@@ -1110 +1110 @@
  * @return void
  */
-function wp_unschedule_comment_destruction($comment_id) {
-    $to_destroy = get_option('to_destroy');
-    if (!is_array($to_destroy))
+function wp_unschedule_comment_delete($comment_id) {
+    $to_delete = get_option('wp_scheduled_delete');
+    if ( !is_array($to_delete) )
         return;
     
-    unset($to_destroy['comments'][$comment_id]);
+    unset($to_delete['comments'][$comment_id]);
     
-    update_option('to_destroy', $to_destroy);
+    update_option('wp_scheduled_delete', $to_delete);
 }