diff --git a/wp-admin/post.php b/wp-admin/post.php
index f006b20b28..d17721f218 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -492,7 +492,6 @@ case 'deletecomment':
 	} else {
 		header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
 	}
-	clear_smarty_cache();
 
 	break;
 
diff --git a/wp-blog-header.php b/wp-blog-header.php
index 0183e36818..14aa8f3b56 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -14,7 +14,7 @@ $query_vars = array();
 if ((isset($_GET['error']) && $_GET['error'] == '404') ||
 		((! empty($_SERVER['PATH_INFO'])) &&
 		('/' != $_SERVER['PATH_INFO']) &&
-		(false === strpos($_SERVER['PATH_INFO'], $_SERVER['SCRIPT_NAME']))
+		(false === strpos($_SERVER['PATH_INFO'], $_SERVER['PHP_SELF']))
 		)) {
 
 	// If we match a rewrite rule, this will be cleared.