diff --git a/wp-feed.php b/wp-feed.php
index 4b662f8abd..8f7dfba258 100644
--- a/wp-feed.php
+++ b/wp-feed.php
@@ -1,6 +1,6 @@
 <?php
 
-if (! $doing_rss) {
+if (empty($doing_rss)) {
     $doing_rss = 1;
     require('wp-blog-header.php');
 }
diff --git a/wp-includes/functions-post.php b/wp-includes/functions-post.php
index 83fe93a300..cc459bfda1 100644
--- a/wp-includes/functions-post.php
+++ b/wp-includes/functions-post.php
@@ -204,15 +204,17 @@ function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array(
 
 function wp_delete_post($postid = 0) {
 	global $wpdb;
-	
-	$sql = "DELETE FROM $wpdb->post2cat WHERE post_id = $postid";
-	$wpdb->query($sql);
-		
-	$sql = "DELETE FROM $wpdb->posts WHERE ID = $postid";
-	
-	$wpdb->query($sql);
 
-	$result = $wpdb->rows_affected;
+	$result = $wpdb->query("DELETE FROM $wpdb->posts WHERE ID = $postid");
+
+	if (!$result)
+		return $result;
+
+	$wpdb->query("DELETE FROM $wpdb->comments WHERE comment_post_ID = $postid");
+
+	$wpdb->query("DELETE FROM $wpdb->post2cat WHERE post_id = $postid");
+
+	$wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = $postid");
 	
 	return $result;
 }