--- wp-admin/admin-ajax.php.ori	2009-12-19 11:32:36.156250000 +0100
+++ wp-admin/admin-ajax.php	2009-12-20 20:48:47.921875000 +0100
@@ -228,7 +228,7 @@
 			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.ori	2009-12-19 11:32:36.187500000 +0100
+++ wp-admin/comment.php	2009-12-20 20:38:31.265625000 +0100
@@ -181,7 +181,7 @@
 
 	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.ori	2009-12-19 11:32:38.796875000 +0100
+++ wp-admin/page.php	2009-12-20 20:38:06.421875000 +0100
@@ -195,7 +195,7 @@
 		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.ori	2009-12-19 11:32:38.828125000 +0100
+++ wp-admin/post.php	2009-12-20 20:40:08.109375000 +0100
@@ -231,13 +231,11 @@
 	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.ori	2009-12-19 11:32:39.875000000 +0100
+++ wp-includes/comment.php	2009-12-20 20:46:21.734375000 +0100
@@ -813,12 +813,12 @@
  * @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);