Ticket #11534: trash-patch.diff

wp-admin/admin-ajax.php

@@ -228 +228 @@
                         die( (string) time() );
                 $r = wp_unspam_comment( $comment->comment_ID );
         } elseif ( isset($_POST['delete']) && 1 == $_POST['delete'] ) {
-                $r = wp_delete_comment( $comment->comment_ID );
+                $r = wp_delete_comment( $comment->comment_ID, true );
         } else {
                 die('-1');
         }

wp-admin/comment.php

@@ -181 +181 @@
 
         switch ( $action ) {
                 case 'deletecomment' :
-                        wp_delete_comment( $comment_id );
+                        wp_delete_comment( $comment_id, true );
                         $redir = add_query_arg( array('deleted' => '1'), $redir );
                         break;
                 case 'trashcomment' :

wp-admin/page.php

@@ -195 +195 @@
                 if ( ! wp_delete_attachment($page_id) )
                         wp_die( __('Error in deleting...') );
         } else {
-                if ( !wp_delete_post($page_id) )
+                if ( !wp_delete_post($page_id, true) )
                         wp_die( __('Error in deleting...') );
         }
 

wp-admin/post.php

@@ -231 +231 @@
         if ( !current_user_can('delete_post', $post_id) )
                 wp_die( __('You are not allowed to delete this post.') );
 
-        $force = !EMPTY_TRASH_DAYS;
         if ( $post->post_type == 'attachment' ) {
-                $force = ( $force || !MEDIA_TRASH );
-                if ( ! wp_delete_attachment($post_id, $force) )
+                if ( ! wp_delete_attachment($post_id, true) )
                         wp_die( __('Error in deleting...') );
         } else {
-                if ( !wp_delete_post($post_id, $force) )
+                if ( !wp_delete_post($post_id, true) )
                         wp_die( __('Error in deleting...') );
         }
 

wp-includes/comment.php

@@ -813 +813 @@
  * @param int $comment_id Comment ID
  * @return bool False if delete comment query failure, true on success.
  */
-function wp_delete_comment($comment_id) {
+function wp_delete_comment($comment_id, $force_delete = false) {
         global $wpdb;
         if (!$comment = get_comment($comment_id))
                 return false;
 
-        if (wp_get_comment_status($comment_id) != 'trash' && wp_get_comment_status($comment_id) != 'spam' && EMPTY_TRASH_DAYS > 0)
+        if (!$force_delete && wp_get_comment_status($comment_id) != 'trash' && wp_get_comment_status($comment_id) != 'spam' && EMPTY_TRASH_DAYS > 0)
                 return wp_trash_comment($comment_id);
 
         do_action('delete_comment', $comment_id);