Index: wp-includes/rewrite.php
===================================================================
--- wp-includes/rewrite.php	(revision 14875)
+++ wp-includes/rewrite.php	(working copy)
@@ -1753,100 +1753,110 @@
 	 *
 	 * @return string
 	 */
-	function iis7_url_rewrite_rules($add_parent_tags = false, $indent = "  ", $end_of_line = "\n") {
+	function iis7_url_rewrite_rules( $add_parent_tags = false ) {
 
 		if ( ! $this->using_permalinks() )
 			return '';
 		$rules = '';
-		$extra_indent = '';
 		if ( $add_parent_tags ) {
-			$rules .= "<configuration>".$end_of_line;
-			$rules .= $indent."<system.webServer>".$end_of_line;
-			$rules .= $indent.$indent."<rewrite>".$end_of_line;
-			$rules .= $indent.$indent.$indent."<rules>".$end_of_line;
-			$extra_indent = $indent.$indent.$indent.$indent;
+			$rules .= '
+			 <configuration>
+			 	<system.webServer>
+			 		<rewrite>
+			 			<rules>
+			';
 		}
 		if ( !is_multisite() ) {
 			if ( $add_parent_tags ) {
-				$rules .= "<configuration>".$end_of_line;
-				$rules .= $indent."<system.webServer>".$end_of_line;
-				$rules .= $indent.$indent."<rewrite>".$end_of_line;
-				$rules .= $indent.$indent.$indent."<rules>".$end_of_line;
-				$extra_indent = $indent.$indent.$indent.$indent;
+				$rules .= '
+				 <configuration>
+				 	<system.webServer>
+				 		<rewrite>
+				 			<rules>
+				';
 			}
+			
+			$rules .= '
+			 <rule name="wordpress" patternSyntax="Wildcard">
+			 	<match url="*" />
+			 		<conditions>
+			 			<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+			 			<add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+			 		</conditions>
+			 	<action type="Rewrite" url="index.php" />
+			 </rule>
+			';
 
-			$rules .= $extra_indent."<rule name=\"wordpress\" patternSyntax=\"Wildcard\">".$end_of_line;
-			$rules .= $extra_indent.$indent."<match url=\"*\" />".$end_of_line;
-			$rules .= $extra_indent.$indent.$indent."<conditions>".$end_of_line;
-			$rules .= $extra_indent.$indent.$indent.$indent."<add input=\"{REQUEST_FILENAME}\" matchType=\"IsFile\" negate=\"true\" />".$end_of_line;
-			$rules .= $extra_indent.$indent.$indent.$indent."<add input=\"{REQUEST_FILENAME}\" matchType=\"IsDirectory\" negate=\"true\" />".$end_of_line;
-			$rules .= $extra_indent.$indent.$indent."</conditions>".$end_of_line;
-			$rules .= $extra_indent.$indent."<action type=\"Rewrite\" url=\"index.php\" />".$end_of_line;
-			$rules .= $extra_indent."</rule>";
-
 		} else {
 			if (is_subdomain_install()) {
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."<rule name=\"wordpress - Rule 1\" stopProcessing=\"true\">".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<match url=\"^index\.php$\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<action type=\"None\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."</rule>".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."<rule name=\"wordpress - Rule 2\" stopProcessing=\"true\">".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<match url=\"^files/(.+)\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<action type=\"Rewrite\" url=\"wp-includes/ms-files.php?file={R:1}\" appendQueryString=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."</rule>".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."<rule name=\"wordpress - Rule 3\" stopProcessing=\"true\">".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<match url=\"^\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<conditions logicalGrouping=\"MatchAny\">".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.$indent."<add input=\"{REQUEST_FILENAME}\" matchType=\"IsFile\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.$indent."<add input=\"{REQUEST_FILENAME}\" matchType=\"IsDirectory\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."</conditions>".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<action type=\"None\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."</rule>".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."<rule name=\"wordpress - Rule 4\" stopProcessing=\"true\">".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<match url=\".\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<action type=\"Rewrite\" url=\"index.php\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."</rule>".$end_of_line;
+				 $rules .= '
+				 				<rule name="wordpress - Rule 1" stopProcessing="true">
+				 					<match url="^index\.php$" ignoreCase="false" />
+				 					<action type="None" />
+				 				</rule>
+				 				<rule name="wordpress - Rule 2" stopProcessing="true">
+				 					<match url="^files/(.+)" ignoreCase="false" />
+				 					<action type="Rewrite" url="wp-includes/ms-files.php?file={R:1}" appendQueryString="false" />
+				 				</rule>
+				 				<rule name="wordpress - Rule 3" stopProcessing="true">
+				 					<match url="^" ignoreCase="false" />
+				 					<conditions logicalGrouping="MatchAny">
+				 						<add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" />
+				 						<add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" />
+				 					</conditions>
+				 					<action type="None" />
+				 				</rule>
+				 				<rule name="wordpress - Rule 4" stopProcessing="true">
+				 					<match url="." ignoreCase="false" />
+				 					<action type="Rewrite" url="index.php" />
+				 				</rule>
+				';
 			} else {
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."<rule name=\"wordpress - Rule 1\" stopProcessing=\"true\">".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<match url=\"^index\.php$\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<action type=\"None\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."</rule>".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."<rule name=\"wordpress - Rule 2\" stopProcessing=\"true\">".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<match url=\"^([_0-9a-zA-Z-]+/)?files/(.+)\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<action type=\"Rewrite\" url=\"wp-includes/ms-files.php?file={R:2}\" appendQueryString=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."</rule>".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."<rule name=\"wordpress - Rule 3\" stopProcessing=\"true\">".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<match url=\"^([_0-9a-zA-Z-]+/)?wp-admin$\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<action type=\"Redirect\" url=\"{R:1}wp-admin/\" redirectType=\"Permanent\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."</rule>".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."<rule name=\"wordpress - Rule 4\" stopProcessing=\"true\">".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<match url=\"^\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<conditions logicalGrouping=\"MatchAny\">".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.$indent."<add input=\"{REQUEST_FILENAME}\" matchType=\"IsFile\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.$indent."<add input=\"{REQUEST_FILENAME}\" matchType=\"IsDirectory\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."</conditions>".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<action type=\"None\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."</rule>".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."<rule name=\"wordpress - Rule 5\" stopProcessing=\"true\">".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<match url=\"^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*)\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<action type=\"Rewrite\" url=\"{R:2}\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."</rule>".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."<rule name=\"wordpress - Rule 6\" stopProcessing=\"true\">".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<match url=\"^([_0-9a-zA-Z-]+/)?(.*\.php)$\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<action type=\"Rewrite\" url=\"{R:2}\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."</rule>".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."<rule name=\"wordpress - Rule 7\" stopProcessing=\"true\">".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<match url=\".\" ignoreCase=\"false\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent."<action type=\"Rewrite\" url=\"index.php\" />".$end_of_line;
-				$rules .= $extra_indent.$indent.$indent.$indent.$indent."</rule>".$end_of_line;
+				$rules .= '
+				 				<rule name="wordpress - Rule 1" stopProcessing="true">
+				 					<match url="^index\.php$" ignoreCase="false" />
+				 					<action type="None" />
+				 				</rule>
+				 				<rule name="wordpress - Rule 2" stopProcessing="true">
+				 					<match url="^([_0-9a-zA-Z-]+/)?files/(.+)" ignoreCase="false" />
+				 					<action type="Rewrite" url="wp-includes/ms-files.php?file={R:2}" appendQueryString="false" />
+				 				</rule>
+				 				<rule name="wordpress - Rule 3" stopProcessing="true">
+				 					<match url="^([_0-9a-zA-Z-]+/)?wp-admin$" ignoreCase="false" />
+				 					<action type="Redirect" url="{R:1}wp-admin/" redirectType="Permanent" />
+				 				</rule>
+				 				<rule name="wordpress - Rule 4" stopProcessing="true">
+				 					<match url="^" ignoreCase="false" />
+				 					<conditions logicalGrouping="MatchAny">
+				 						<add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" />
+				 						<add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" />
+				 					</conditions>
+				 					<action type="None" />
+				 				</rule>
+				 				<rule name="wordpress - Rule 5" stopProcessing="true">
+				 					<match url="^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*)" ignoreCase="false" />
+				 					<action type="Rewrite" url="{R:2}" />
+				 				</rule>
+				 				<rule name="wordpress - Rule 6" stopProcessing="true">
+				 					<match url="^([_0-9a-zA-Z-]+/)?(.*\.php)$" ignoreCase="false" />
+				 					<action type="Rewrite" url="{R:2}" />
+				 				</rule>
+				 				<rule name="wordpress - Rule 7" stopProcessing="true">
+				 					<match url="." ignoreCase="false" />
+				 					<action type="Rewrite" url="index.php" />
+				 				</rule>
+				';
 			}
 		}
 		if ( $add_parent_tags ) {
-			$rules .= $end_of_line.$indent.$indent.$indent."</rules>".$end_of_line;
-			$rules .= $indent.$indent."</rewrite>".$end_of_line;
-			$rules .= $indent."</system.webServer>".$end_of_line;
-			$rules .= "</configuration>";
+			$rules .= '
+			 			</rules>
+			 		</rewrite>
+			 	</system.webServer>
+			 </configuration>
+			';
 		}
+
 		$rules = apply_filters('iis7_url_rewrite_rules', $rules);
 
 		return $rules;