If we attempt path info matching but do not match, set 404. Also, retabify some code.

git-svn-id: http://svn.automattic.com/wordpress/trunk@1697 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-blog-header.php

@@ -14,6 +14,9 @@ $query_vars = array();
 if ((isset($_GET['error']) && $_GET['error'] == '404') ||
     (! empty( $_SERVER['PATH_INFO']))) {
 
+	// If we match a rewrite rule, this will be cleared.
+	$error = '404';
+
 	// Fetch the rewrite rules.
 	$rewrite = rewrite_rules('matches');