From 0ad4b94b5dd2bdbac3314f7e2e8a8d9815935dfe Mon Sep 17 00:00:00 2001 From: donncha Date: Fri, 16 Dec 2005 10:28:20 +0000 Subject: WP Merge git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@472 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-inst/wp-admin/post.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'wp-inst/wp-admin/post.php') diff --git a/wp-inst/wp-admin/post.php b/wp-inst/wp-admin/post.php index ea53a07..e3456b6 100644 --- a/wp-inst/wp-admin/post.php +++ b/wp-inst/wp-admin/post.php @@ -136,8 +136,13 @@ case 'delete': if ( !current_user_can('edit_post', $post_id) ) die( __('You are not allowed to delete this post.') ); - if ( (($post->post_status != 'attachment') && !wp_delete_post($post_id)) || !wp_delete_attachment($post_id)) - die( __('Error in deleting...') ); + if ( $post->post_status == 'attachment' ) { + if ( ! wp_delete_attachment($post_id) ) + die( __('Error in deleting...') ); + } else { + 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'; -- cgit