[wp-cvs] wordpress/wp-admin post.php,1.110,1.111

[Ryan Boren]

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5568

Modified Files:
	post.php 
Log Message:
Fix post deletion.  Update wp_delete_post() and call from post.php.  Bug 472.

Index: post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/post.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** post.php	21 Nov 2004 21:28:18 -0000	1.110
--- post.php	27 Nov 2004 04:46:54 -0000	1.111
***************
*** 19,22 ****
--- 19,26 ----
  }
  
+ if (isset($_POST['deletepost'])) {
+ $action = "delete";
+ }
+ 
  switch($action) {
  case 'post':
***************
*** 389,407 ****
  	check_admin_referer();
  
! 	$post_id = intval($_GET['post']);
  	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)
  		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';
--- 393,405 ----
  	check_admin_referer();
  
! 	$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.');
  	}
  
! 	if (! wp_delete_post($post_id))
  		die(__('Error in deleting...'));
  
  	$sendback = $_SERVER['HTTP_REFERER'];
  	if (strstr($sendback, 'post.php')) $sendback = get_settings('siteurl') .'/wp-admin/post.php';