From e9cd4f12ccbd146c7340331f1e3f9fc5599db7eb Mon Sep 17 00:00:00 2001
From: rboren <rboren@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 27 Nov 2004 04:46:54 +0000
Subject: [PATCH] Fix post deletion.  Update wp_delete_post() and call from
 post.php.  Bug 472.

git-svn-id: http://svn.automattic.com/wordpress/trunk@1891 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/post.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/wp-admin/post.php b/wp-admin/post.php
index baa3c9216..f006b20b2 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -18,6 +18,10 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
 	}
 }
 
+if (isset($_POST['deletepost'])) {
+$action = "delete";
+}
+
 switch($action) {
 case 'post':
 
@@ -388,21 +392,15 @@ case 'editpost':
 case 'delete':
 	check_admin_referer();
 
-	$post_id = intval($_GET['post']);
+	$post_id = (isset($_GET['post']))  ? intval($_GET['post']) : intval($_POST['post_ID']);
+	
 	if (!user_can_delete_post($user_ID, $post_id)) {
 		die('You are not allowed to delete this post.');
 	}
 
-	$result = $wpdb->query("DELETE FROM $wpdb->posts WHERE ID=$post_id");
-	if (!$result)
+	if (! wp_delete_post($post_id))
 		die(__('Error in deleting...'));
 
-	$result = $wpdb->query("DELETE FROM $wpdb->comments WHERE comment_post_ID=$post_id");
-
-	$categories = $wpdb->query("DELETE FROM $wpdb->post2cat WHERE post_id = $post_id");
-
-	$meta = $wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = $post_id");
-
 	$sendback = $_SERVER['HTTP_REFERER'];
 	if (strstr($sendback, 'post.php')) $sendback = get_settings('siteurl') .'/wp-admin/post.php';
 	$sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);