Changeset 12412

Timestamp:

12/16/2009 01:35:29 AM (15 years ago)

Author:

azaozz

Message:

Check post and comment status before emptying trash, fixes #11442

File:

• trunk/wp-includes/functions.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -3519 +3519 @@
 
     foreach ( (array) $posts_to_delete as $post ) {
-        wp_delete_post($post['post_id']);
+        $post_id = (int) $post['post_id'];
+        if ( !$post_id )
+            continue;
+
+        $del_post = get_post($post_id);
+
+        if ( !$del_post || 'trash' != $del_post->post_status ) {
+            delete_post_meta($post_id, '_wp_trash_meta_status');
+            delete_post_meta($post_id, '_wp_trash_meta_time');
+        } else {
+            wp_delete_post($post_id);
+        }
     }
 
@@ -3525 +3536 @@
 
     foreach ( (array) $comments_to_delete as $comment ) {
-        wp_delete_comment($comment['comment_id']);
+        $comment_id = (int) $comment['comment_id'];
+        if ( !$comment_id )
+            continue;
+
+        $del_comment = get_comment($comment_id);
+
+        if ( !$del_comment || 'trash' != $del_comment->comment_approved ) {
+            delete_comment_meta($comment_id, '_wp_trash_meta_time');
+            delete_comment_meta($comment_id, '_wp_trash_meta_status');
+        } else {
+            wp_delete_comment($comment_id);
+        }
     }
 }