<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14871] trunk: update rewrite rules for IIS, props Frumph, see #12758</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14871">14871</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-05-25 05:12:47 +0000 (Tue, 25 May 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>update rewrite rules for IIS, props Frumph, see <a href="http://trac.wordpress.org/ticket/12758">#12758</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (14870 => 14871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php        2010-05-25 02:47:43 UTC (rev 14870)
+++ trunk/wp-admin/network.php        2010-05-25 05:12:47 UTC (rev 14871)
</span><span class="lines">@@ -336,35 +336,119 @@
</span><span class="cx"> ?&gt;
</span><span class="cx"> &lt;/li&gt;
</span><span class="cx"> &lt;?php
</span><del>-// Construct an htaccess file.
-$htaccess_file = 'RewriteEngine On
-RewriteBase ' . $base . '
-RewriteRule ^index\.php$ - [L]
-
-# uploaded files
-RewriteRule ^' . ( $subdomain_install ? '' : '([_0-9a-zA-Z-]+/)?' ) . 'files/(.+) wp-includes/ms-files.php?file=$' . ( $subdomain_install ? 1 : 2 ) . ' [L]' . &quot;\n&quot;;
-
-if ( ! $subdomain_install )
-        $htaccess_file .= &quot;\n# add a trailing slash to /wp-admin\n&quot; . 'RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]' . &quot;\n&quot;;
-
-$htaccess_file .= &quot;\n&quot; . 'RewriteCond %{REQUEST_FILENAME} -f [OR]
-RewriteCond %{REQUEST_FILENAME} -d
-RewriteRule ^ - [L]';
-
-// @todo custom content dir.
-if ( ! $subdomain_install )
-        $htaccess_file .= &quot;\n&quot; . 'RewriteRule  ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]
-RewriteRule  ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]';
-
-$htaccess_file .= &quot;\nRewriteRule . index.php [L]&quot;;
-
-?&gt;
-                        &lt;li&gt;&lt;p&gt;&lt;?php printf( __( 'Add the following to your &lt;code&gt;.htaccess&lt;/code&gt; file in &lt;code&gt;%s&lt;/code&gt;, replacing other WordPress rules:' ), ABSPATH ); ?&gt;&lt;/p&gt;
-                                &lt;textarea class=&quot;code&quot; readonly=&quot;readonly&quot; cols=&quot;100&quot; rows=&quot;&lt;?php echo $subdomain_install ? 11 : 16; ?&gt;&quot;&gt;
-&lt;?php echo wp_htmledit_pre( $htaccess_file ); ?&gt;
-&lt;/textarea&gt;&lt;/li&gt;
</del><ins>+        if (iis7_supports_permalinks()) { 
+                        if (is_subdomain_install()) {
+                                $web_config_file = 
+'&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+&lt;configuration&gt;
+    &lt;system.webServer&gt;
+        &lt;rewrite&gt;
+            &lt;rules&gt;
+                &lt;rule name=&quot;WordPress Rule 1&quot; stopProcessing=&quot;true&quot;&gt;
+                    &lt;match url=&quot;^index\.php$&quot; ignoreCase=&quot;false&quot; /&gt;
+                    &lt;action type=&quot;None&quot; /&gt;
+                &lt;/rule&gt;
+                &lt;rule name=&quot;WordPress Rule 2&quot; stopProcessing=&quot;true&quot;&gt;
+                    &lt;match url=&quot;^files/(.+)&quot; ignoreCase=&quot;false&quot; /&gt;
+                    &lt;action type=&quot;Rewrite&quot; url=&quot;wp-includes/ms-files.php?file={R:1}&quot; appendQueryString=&quot;false&quot; /&gt;
+                &lt;/rule&gt;
+                &lt;rule name=&quot;WordPress Rule 3&quot; stopProcessing=&quot;true&quot;&gt;
+                    &lt;match url=&quot;^&quot; ignoreCase=&quot;false&quot; /&gt;
+                    &lt;conditions logicalGrouping=&quot;MatchAny&quot;&gt;
+                        &lt;add input=&quot;{REQUEST_FILENAME}&quot; matchType=&quot;IsFile&quot; ignoreCase=&quot;false&quot; /&gt;
+                        &lt;add input=&quot;{REQUEST_FILENAME}&quot; matchType=&quot;IsDirectory&quot; ignoreCase=&quot;false&quot; /&gt;
+                    &lt;/conditions&gt;
+                    &lt;action type=&quot;None&quot; /&gt;
+                &lt;/rule&gt;
+                &lt;rule name=&quot;WordPress Rule 4&quot; stopProcessing=&quot;true&quot;&gt;
+                    &lt;match url=&quot;.&quot; ignoreCase=&quot;false&quot; /&gt;
+                    &lt;action type=&quot;Rewrite&quot; url=&quot;index.php&quot; /&gt;
+                &lt;/rule&gt;
+            &lt;/rules&gt;
+        &lt;/rewrite&gt;
+    &lt;/system.webServer&gt;
+&lt;/configuration&gt;';
+                        } else {
+                                $web_config_file = 
+'&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+&lt;configuration&gt;
+    &lt;system.webServer&gt;
+        &lt;rewrite&gt;
+            &lt;rules&gt;
+                &lt;rule name=&quot;WordPress Rule 1&quot; stopProcessing=&quot;true&quot;&gt;
+                    &lt;match url=&quot;^index\.php$&quot; ignoreCase=&quot;false&quot; /&gt;
+                    &lt;action type=&quot;None&quot; /&gt;
+                &lt;/rule&gt;
+                &lt;rule name=&quot;WordPress Rule 2&quot; stopProcessing=&quot;true&quot;&gt;
+                    &lt;match url=&quot;^([_0-9a-zA-Z-]+/)?files/(.+)&quot; ignoreCase=&quot;false&quot; /&gt;
+                    &lt;action type=&quot;Rewrite&quot; url=&quot;wp-includes/ms-files.php?file={R:2}&quot; appendQueryString=&quot;false&quot; /&gt;
+                &lt;/rule&gt;
+                &lt;rule name=&quot;WordPress Rule 3&quot; stopProcessing=&quot;true&quot;&gt;
+                    &lt;match url=&quot;^([_0-9a-zA-Z-]+/)?wp-admin$&quot; ignoreCase=&quot;false&quot; /&gt;
+                    &lt;action type=&quot;Redirect&quot; url=&quot;{R:1}wp-admin/&quot; redirectType=&quot;Permanent&quot; /&gt;
+                &lt;/rule&gt;
+                &lt;rule name=&quot;WordPress Rule 4&quot; stopProcessing=&quot;true&quot;&gt;
+                    &lt;match url=&quot;^&quot; ignoreCase=&quot;false&quot; /&gt;
+                    &lt;conditions logicalGrouping=&quot;MatchAny&quot;&gt;
+                        &lt;add input=&quot;{REQUEST_FILENAME}&quot; matchType=&quot;IsFile&quot; ignoreCase=&quot;false&quot; /&gt;
+                        &lt;add input=&quot;{REQUEST_FILENAME}&quot; matchType=&quot;IsDirectory&quot; ignoreCase=&quot;false&quot; /&gt;
+                    &lt;/conditions&gt;
+                    &lt;action type=&quot;None&quot; /&gt;
+                &lt;/rule&gt;
+                &lt;rule name=&quot;WordPress Rule 5&quot; stopProcessing=&quot;true&quot;&gt;
+                    &lt;match url=&quot;^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*)&quot; ignoreCase=&quot;false&quot; /&gt;
+                    &lt;action type=&quot;Rewrite&quot; url=&quot;{R:2}&quot; /&gt;
+                &lt;/rule&gt;
+                &lt;rule name=&quot;WordPress Rule 6&quot; stopProcessing=&quot;true&quot;&gt;
+                    &lt;match url=&quot;^([_0-9a-zA-Z-]+/)?(.*\.php)$&quot; ignoreCase=&quot;false&quot; /&gt;
+                    &lt;action type=&quot;Rewrite&quot; url=&quot;{R:2}&quot; /&gt;
+                &lt;/rule&gt;
+                &lt;rule name=&quot;WordPress Rule 7&quot; stopProcessing=&quot;true&quot;&gt;
+                    &lt;match url=&quot;.&quot; ignoreCase=&quot;false&quot; /&gt;
+                    &lt;action type=&quot;Rewrite&quot; url=&quot;index.php&quot; /&gt;
+                &lt;/rule&gt;
+            &lt;/rules&gt;
+        &lt;/rewrite&gt;
+    &lt;/system.webServer&gt;
+&lt;/configuration&gt;';
+                        }
+        ?&gt;
+                &lt;li&gt;&lt;p&gt;&lt;?php printf( __( 'Add the following to your &lt;code&gt;web.config&lt;/code&gt; file in &lt;code&gt;%s&lt;/code&gt;, replacing other WordPress rules:' ), ABSPATH ); ?&gt;&lt;/p&gt;
+                &lt;textarea class=&quot;code&quot; readonly=&quot;readonly&quot; cols=&quot;100&quot; rows=&quot;20&quot;&gt;
+                &lt;?php echo wp_htmledit_pre( $web_config_file ); ?&gt;
+                &lt;/textarea&gt;&lt;/li&gt;
</ins><span class="cx">                 &lt;/ol&gt;
</span><del>-&lt;?php if ( !is_multisite() ) { ?&gt;
</del><ins>+        &lt;?php } else {
+                // Construct an htaccess file.
+                $htaccess_file = 'RewriteEngine On
+                                RewriteBase ' . $base . '
+                                RewriteRule ^index\.php$ - [L]
+                                
+                                # uploaded files
+                                RewriteRule ^' . ( $subdomain_install ? '' : '([_0-9a-zA-Z-]+/)?' ) . 'files/(.+) wp-includes/ms-files.php?file=$' . ( $subdomain_install ? 1 : 2 ) . ' [L]' . &quot;\n&quot;;
+                
+                if ( ! $subdomain_install )
+                        $htaccess_file .= &quot;\n# add a trailing slash to /wp-admin\n&quot; . 'RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]' . &quot;\n&quot;;
+                
+                $htaccess_file .= &quot;\n&quot; . 'RewriteCond %{REQUEST_FILENAME} -f [OR]
+                                RewriteCond %{REQUEST_FILENAME} -d
+                                RewriteRule ^ - [L]';
+                
+                // @todo custom content dir.
+                if ( ! $subdomain_install )
+                        $htaccess_file .= &quot;\n&quot; . 'RewriteRule  ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]
+                                        RewriteRule  ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]';
+                
+                $htaccess_file .= &quot;\nRewriteRule . index.php [L]&quot;;
+                
+                ?&gt;
+                &lt;li&gt;&lt;p&gt;&lt;?php printf( __( 'Add the following to your &lt;code&gt;.htaccess&lt;/code&gt; file in &lt;code&gt;%s&lt;/code&gt;, replacing other WordPress rules:' ), ABSPATH ); ?&gt;&lt;/p&gt;
+                &lt;textarea class=&quot;code&quot; readonly=&quot;readonly&quot; cols=&quot;100&quot; rows=&quot;&lt;?php echo $subdomain_install ? 11 : 16; ?&gt;&quot;&gt;
+                &lt;?php echo wp_htmledit_pre( $htaccess_file ); ?&gt;
+                &lt;/textarea&gt;&lt;/li&gt;
+                &lt;/ol&gt;
+        &lt;?php }
+        if ( !is_multisite() ) { ?&gt;
</ins><span class="cx">                 &lt;p&gt;&lt;?php printf( __( 'Once you complete these steps, your network is enabled and configured. You will have to log in again.') ); ?&gt; &lt;a href=&quot;&lt;?php echo esc_url( site_url( 'wp-login.php' ) ); ?&gt;&quot;&gt;&lt;?php _e( 'Log In' ); ?&gt;&lt;/a&gt;&lt;/p&gt;
</span><span class="cx"> &lt;?php
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (14870 => 14871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php        2010-05-25 02:47:43 UTC (rev 14870)
+++ trunk/wp-includes/ms-functions.php        2010-05-25 05:12:47 UTC (rev 14871)
</span><span class="lines">@@ -1302,7 +1302,7 @@
</span><span class="cx"> 
</span><span class="cx"> function maybe_redirect_404() {
</span><span class="cx">         global $current_site;
</span><del>-        if ( is_main_site() &amp;&amp; is_404() &amp;&amp; defined( 'NOBLOGREDIRECT' ) &amp;&amp; ( $destination = NOBLOGREDIRECT ) ) {
</del><ins>+        if ( ( !defined( 'NO404REDIRECT' ) || ! NO404REDIRECT ) &amp;&amp; is_main_site() &amp;&amp; is_404() &amp;&amp; defined( 'NOBLOGREDIRECT' ) &amp;&amp; ( $destination = NOBLOGREDIRECT ) ) {
</ins><span class="cx">                 if ( $destination == '%siteurl%' )
</span><span class="cx">                         $destination = network_home_url();
</span><span class="cx">                 wp_redirect( $destination );
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (14870 => 14871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php        2010-05-25 02:47:43 UTC (rev 14870)
+++ trunk/wp-includes/rewrite.php        2010-05-25 05:12:47 UTC (rev 14871)
</span><span class="lines">@@ -1757,10 +1757,16 @@
</span><span class="cx"> 
</span><span class="cx">                 if ( ! $this-&gt;using_permalinks() )
</span><span class="cx">                         return '';
</span><del>-
</del><ins>+                $rules = '';
+                $extra_indent = '';
+                if ( $add_parent_tags ) {
+                        $rules .= &quot;&lt;configuration&gt;&quot;.$end_of_line;
+                        $rules .= $indent.&quot;&lt;system.webServer&gt;&quot;.$end_of_line;
+                        $rules .= $indent.$indent.&quot;&lt;rewrite&gt;&quot;.$end_of_line;
+                        $rules .= $indent.$indent.$indent.&quot;&lt;rules&gt;&quot;.$end_of_line;
+                        $extra_indent = $indent.$indent.$indent.$indent;
+                }
</ins><span class="cx">                 if ( !is_multisite() ) {
</span><del>-                        $rules = '';
-                        $extra_indent = '';
</del><span class="cx">                         if ( $add_parent_tags ) {
</span><span class="cx">                                 $rules .= &quot;&lt;configuration&gt;&quot;.$end_of_line;
</span><span class="cx">                                 $rules .= $indent.&quot;&lt;system.webServer&gt;&quot;.$end_of_line;
</span><span class="lines">@@ -1778,63 +1784,69 @@
</span><span class="cx">                         $rules .= $extra_indent.$indent.&quot;&lt;action type=\&quot;Rewrite\&quot; url=\&quot;index.php\&quot; /&gt;&quot;.$end_of_line;
</span><span class="cx">                         $rules .= $extra_indent.&quot;&lt;/rule&gt;&quot;;
</span><span class="cx"> 
</span><del>-                        if ( $add_parent_tags ) {
-                                $rules .= $end_of_line.$indent.$indent.$indent.&quot;&lt;/rules&gt;&quot;.$end_of_line;
-                                $rules .= $indent.$indent.&quot;&lt;/rewrite&gt;&quot;.$end_of_line;
-                                $rules .= $indent.&quot;&lt;/system.webServer&gt;&quot;.$end_of_line;
-                                $rules .= &quot;&lt;/configuration&gt;&quot;;
</del><ins>+                } else {
+                        if (is_subdomain_install()) {
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;rule name=\&quot;wordpress - Rule 1\&quot; stopProcessing=\&quot;true\&quot;&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;match url=\&quot;^index\.php$\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;action type=\&quot;None\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;/rule&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;rule name=\&quot;wordpress - Rule 2\&quot; stopProcessing=\&quot;true\&quot;&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;match url=\&quot;^files/(.+)\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;action type=\&quot;Rewrite\&quot; url=\&quot;wp-includes/ms-files.php?file={R:1}\&quot; appendQueryString=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;/rule&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;rule name=\&quot;wordpress - Rule 3\&quot; stopProcessing=\&quot;true\&quot;&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;match url=\&quot;^\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;conditions logicalGrouping=\&quot;MatchAny\&quot;&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;add input=\&quot;{REQUEST_FILENAME}\&quot; matchType=\&quot;IsFile\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;add input=\&quot;{REQUEST_FILENAME}\&quot; matchType=\&quot;IsDirectory\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;/conditions&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;action type=\&quot;None\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;/rule&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;rule name=\&quot;wordpress - Rule 4\&quot; stopProcessing=\&quot;true\&quot;&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;match url=\&quot;.\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;action type=\&quot;Rewrite\&quot; url=\&quot;index.php\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;/rule&gt;&quot;.$end_of_line;
+                        } else {
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;rule name=\&quot;wordpress - Rule 1\&quot; stopProcessing=\&quot;true\&quot;&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;match url=\&quot;^index\.php$\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;action type=\&quot;None\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;/rule&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;rule name=\&quot;wordpress - Rule 2\&quot; stopProcessing=\&quot;true\&quot;&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;match url=\&quot;^([_0-9a-zA-Z-]+/)?files/(.+)\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;action type=\&quot;Rewrite\&quot; url=\&quot;wp-includes/ms-files.php?file={R:2}\&quot; appendQueryString=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;/rule&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;rule name=\&quot;wordpress - Rule 3\&quot; stopProcessing=\&quot;true\&quot;&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;match url=\&quot;^([_0-9a-zA-Z-]+/)?wp-admin$\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;action type=\&quot;Redirect\&quot; url=\&quot;{R:1}wp-admin/\&quot; redirectType=\&quot;Permanent\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;/rule&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;rule name=\&quot;wordpress - Rule 4\&quot; stopProcessing=\&quot;true\&quot;&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;match url=\&quot;^\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;conditions logicalGrouping=\&quot;MatchAny\&quot;&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;add input=\&quot;{REQUEST_FILENAME}\&quot; matchType=\&quot;IsFile\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;add input=\&quot;{REQUEST_FILENAME}\&quot; matchType=\&quot;IsDirectory\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;/conditions&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;action type=\&quot;None\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;/rule&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;rule name=\&quot;wordpress - Rule 5\&quot; stopProcessing=\&quot;true\&quot;&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;match url=\&quot;^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*)\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;action type=\&quot;Rewrite\&quot; url=\&quot;{R:2}\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;/rule&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;rule name=\&quot;wordpress - Rule 6\&quot; stopProcessing=\&quot;true\&quot;&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;match url=\&quot;^([_0-9a-zA-Z-]+/)?(.*\.php)$\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;action type=\&quot;Rewrite\&quot; url=\&quot;{R:2}\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;/rule&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;rule name=\&quot;wordpress - Rule 7\&quot; stopProcessing=\&quot;true\&quot;&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;match url=\&quot;.\&quot; ignoreCase=\&quot;false\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.$indent.&quot;&lt;action type=\&quot;Rewrite\&quot; url=\&quot;index.php\&quot; /&gt;&quot;.$end_of_line;
+                                $rules .= $extra_indent.$indent.$indent.$indent.$indent.&quot;&lt;/rule&gt;&quot;.$end_of_line;
</ins><span class="cx">                         }
</span><del>-                } else {
-                        $siteurl = get_option( 'siteurl' );
-                        $siteurl_len = strlen( $siteurl );
-                        if ( substr( WP_CONTENT_URL, 0, $siteurl_len ) == $siteurl &amp;&amp; strlen( WP_CONTENT_URL ) &gt; $siteurl_len )
-                                $content_path = substr( WP_CONTENT_URL, $siteurl_len + 1 );
-                        else
-                                $content_path = 'wp-content';
-                        $rules = '&lt;rule name=&quot;wordpress - strip index.php&quot; stopProcessing=&quot;false&quot;&gt;
-                                        &lt;match url=&quot;^index.php/(.*)$&quot; /&gt;
-                                                &lt;action type=&quot;Rewrite&quot; url=&quot;{R:1}&quot; /&gt;
-                                        &lt;/rule&gt;
-                                        &lt;rule name=&quot;wordpress - 1&quot; stopProcessing=&quot;true&quot;&gt;
-                                                &lt;match url=&quot;^(.*/)?files/$&quot; /&gt;
-                                                &lt;action type=&quot;Rewrite&quot; url=&quot;index.php&quot; /&gt;
-                                        &lt;/rule&gt;
-                                        &lt;rule name=&quot;wordpress - 2&quot; stopProcessing=&quot;true&quot;&gt;
-                                                &lt;match url=&quot;^(.*/)?files/(.*)&quot; /&gt;
-                                                &lt;conditions&gt;
-                                                        &lt;add input=&quot;{REQUEST_URI}&quot; negate=&quot;true&quot; pattern=&quot;.*' . $content_path . '/plugins.*&quot;/&gt;
-                                                &lt;/conditions&gt;
-                                                &lt;action type=&quot;Rewrite&quot; url=&quot;wp-includes/ms-files.php?file={R:2}&quot; appendQueryString=&quot;false&quot; /&gt;
-                                        &lt;/rule&gt;
-                                        &lt;rule name=&quot;wordpress - 3&quot; stopProcessing=&quot;true&quot;&gt;
-                                                &lt;match url=&quot;^(.+)$&quot; /&gt;
-                                                &lt;conditions&gt;
-                                                        &lt;add input=&quot;{REQUEST_URI}&quot; pattern=&quot;^.*/wp-admin$&quot; /&gt;
-                                                &lt;/conditions&gt;
-                                                &lt;action type=&quot;Redirect&quot; url=&quot;{R:1}/&quot; redirectType=&quot;Permanent&quot; /&gt;
-                                        &lt;/rule&gt;
-                                        &lt;rule name=&quot;wordpress - 4&quot; stopProcessing=&quot;true&quot;&gt;
-                                                &lt;match url=&quot;.&quot;/&gt;
-                                                &lt;conditions logicalGrouping=&quot;MatchAny&quot;&gt;
-                                                        &lt;add input=&quot;{REQUEST_FILENAME}&quot; matchType=&quot;IsFile&quot; pattern=&quot;&quot; /&gt;
-                                                        &lt;add input=&quot;{REQUEST_FILENAME}&quot; matchType=&quot;IsDirectory&quot; pattern=&quot;&quot; /&gt;
-                                                &lt;/conditions&gt;
-                                                &lt;action type=&quot;None&quot; /&gt;
-                                        &lt;/rule&gt;
-                                        &lt;rule name=&quot;wordpress - 5&quot; stopProcessing=&quot;true&quot;&gt;
-                                                &lt;match url=&quot;^([_0-9a-zA-Z-]+/)?(wp-.*)&quot; /&gt;
-                                                &lt;action type=&quot;Rewrite&quot; url=&quot;{R:2}&quot; /&gt;
-                                        &lt;/rule&gt;
-                                        &lt;rule name=&quot;wordpress - 6&quot; stopProcessing=&quot;true&quot;&gt;
-                                                &lt;match url=&quot;^([_0-9a-zA-Z-]+/)?(.*\.php)$&quot; /&gt;
-                                                &lt;action type=&quot;Rewrite&quot; url=&quot;{R:2}&quot; /&gt;
-                                        &lt;/rule&gt;
-                                        &lt;rule name=&quot;wordpress - 7&quot; stopProcessing=&quot;true&quot;&gt;
-                                                &lt;match url=&quot;.&quot; /&gt;
-                                                &lt;action type=&quot;Rewrite&quot; url=&quot;index.php&quot; /&gt;
-                                        &lt;/rule&gt;';
</del><span class="cx">                 }
</span><del>-
</del><ins>+                if ( $add_parent_tags ) {
+                        $rules .= $end_of_line.$indent.$indent.$indent.&quot;&lt;/rules&gt;&quot;.$end_of_line;
+                        $rules .= $indent.$indent.&quot;&lt;/rewrite&gt;&quot;.$end_of_line;
+                        $rules .= $indent.&quot;&lt;/system.webServer&gt;&quot;.$end_of_line;
+                        $rules .= &quot;&lt;/configuration&gt;&quot;;
+                }
</ins><span class="cx">                 $rules = apply_filters('iis7_url_rewrite_rules', $rules);
</span><span class="cx"> 
</span><span class="cx">                 return $rules;
</span></span></pre>
</div>
</div>

</body>
</html>