From dcaa152386b8733b74edb2fad47b76f5e3f5e63f Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Thu, 15 Dec 2005 22:26:22 +0000 Subject: [PATCH] Don't die. git-svn-id: https://develop.svn.wordpress.org/trunk@3315 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/post.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/wp-admin/post.php b/wp-admin/post.php index ea53a0740c..e3456b67d9 100644 --- a/wp-admin/post.php +++ b/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';