
<!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" />

<title>[23177] trunk/wp-admin/network.php: Fix code vomit in IIS rewrite rule generation.</title>

</head>

<body>


<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#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>

<div id="msg">

<dl class="meta">

<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23177">23177</a></dd>

<dt>Author</dt> <dd>markjaquith</dd>

<dt>Date</dt> <dd>2012-12-13 22:54:36 +0000 (Thu, 13 Dec 2012)</dd>

</dl>


<h3>Log Message</h3>

<pre>Fix code vomit in IIS rewrite rule generation. fixes <a href="http://core.trac.wordpress.org/ticket/22920">#22920</a> for trunk. props toscho.</pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.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 (23176 => 23177)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/network.php        2012-12-13 09:59:28 UTC (rev 23176)

+++ trunk/wp-admin/network.php        2012-12-13 22:54:36 UTC (rev 23177)

</span><span class="lines">@@ -411,8 +411,7 @@

</span><span class="cx">                 $iis_rewrite_base = ltrim( $base, '/' ) . $rewrite_base;

</span><span class="cx">                 $iis_subdir_replacement = $subdomain_install ? '' : '{R:1}';

</span><span class="cx"> 

</span><del>-                $web_config_file = &lt;&lt;&lt;EOF

-&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;

</del><ins>+                $web_config_file = '&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;

</ins><span class="cx"> &lt;configuration&gt;

</span><span class="cx">     &lt;system.webServer&gt;

</span><span class="cx">         &lt;rewrite&gt;

</span><span class="lines">@@ -424,14 +423,14 @@

</span><span class="cx">                                 if ( is_multisite() &amp;&amp; get_site_option( 'ms_files_rewriting' ) ) {

</span><span class="cx">                                         $web_config_file .= '

</span><span class="cx">                 &lt;rule name=&quot;WordPress Rule for Files&quot; stopProcessing=&quot;true&quot;&gt;

</span><del>-                    &lt;match url=&quot;^{$iis_subdir_match}files/(.+)&quot; ignoreCase=&quot;false&quot; /&gt;

-                    &lt;action type=&quot;Rewrite&quot; url=&quot;{$iis_rewrite_base}wp-includes/ms-files.php?file={R:1}&quot; appendQueryString=&quot;false&quot; /&gt;

</del><ins>+                    &lt;match url=&quot;^' . $iis_subdir_match . 'files/(.+)&quot; ignoreCase=&quot;false&quot; /&gt;

+                    &lt;action type=&quot;Rewrite&quot; url=&quot;' . $iis_rewrite_base . 'wp-includes/ms-files.php?file={R:1}&quot; appendQueryString=&quot;false&quot; /&gt;

</ins><span class="cx">                 &lt;/rule&gt;';

</span><span class="cx">                 }

</span><span class="cx">                 $web_config_file .= '

</span><span class="cx">                 &lt;rule name=&quot;WordPress Rule 2&quot; stopProcessing=&quot;true&quot;&gt;

</span><del>-                    &lt;match url=&quot;^{$iis_subdir_match}wp-admin$&quot; ignoreCase=&quot;false&quot; /&gt;

-                    &lt;action type=&quot;Redirect&quot; url=&quot;{$iis_subdir_replacement}wp-admin/&quot; redirectType=&quot;Permanent&quot; /&gt;

</del><ins>+                    &lt;match url=&quot;^' . $iis_subdir_match . 'wp-admin$&quot; ignoreCase=&quot;false&quot; /&gt;

+                    &lt;action type=&quot;Redirect&quot; url=&quot;' . $iis_subdir_replacement . 'wp-admin/&quot; redirectType=&quot;Permanent&quot; /&gt;

</ins><span class="cx">                 &lt;/rule&gt;

</span><span class="cx">                 &lt;rule name=&quot;WordPress Rule 3&quot; stopProcessing=&quot;true&quot;&gt;

</span><span class="cx">                     &lt;match url=&quot;^&quot; ignoreCase=&quot;false&quot; /&gt;

</span><span class="lines">@@ -442,12 +441,12 @@

</span><span class="cx">                     &lt;action type=&quot;None&quot; /&gt;

</span><span class="cx">                 &lt;/rule&gt;

</span><span class="cx">                 &lt;rule name=&quot;WordPress Rule 4&quot; stopProcessing=&quot;true&quot;&gt;

</span><del>-                    &lt;match url=&quot;^{$iis_subdir_match}(wp-(content|admin|includes).*)&quot; ignoreCase=&quot;false&quot; /&gt;

-                    &lt;action type=&quot;Rewrite&quot; url=&quot;{$iis_rewrite_base}{R:1}&quot; /&gt;

</del><ins>+                    &lt;match url=&quot;^' . $iis_subdir_match . '(wp-(content|admin|includes).*)&quot; ignoreCase=&quot;false&quot; /&gt;

+                    &lt;action type=&quot;Rewrite&quot; url=&quot;' . $iis_rewrite_base . '{R:1}&quot; /&gt;

</ins><span class="cx">                 &lt;/rule&gt;

</span><span class="cx">                 &lt;rule name=&quot;WordPress Rule 5&quot; stopProcessing=&quot;true&quot;&gt;

</span><del>-                    &lt;match url=&quot;^{$iis_subdir_match}([_0-9a-zA-Z-]+/)?(.*\.php)$&quot; ignoreCase=&quot;false&quot; /&gt;

-                    &lt;action type=&quot;Rewrite&quot; url=&quot;{$iis_rewrite_base}{R:2}&quot; /&gt;

</del><ins>+                    &lt;match url=&quot;^' . $iis_subdir_match . '([_0-9a-zA-Z-]+/)?(.*\.php)$&quot; ignoreCase=&quot;false&quot; /&gt;

+                    &lt;action type=&quot;Rewrite&quot; url=&quot;' . $iis_rewrite_base . '{R:2}&quot; /&gt;

</ins><span class="cx">                 &lt;/rule&gt;

</span><span class="cx">                 &lt;rule name=&quot;WordPress Rule 6&quot; stopProcessing=&quot;true&quot;&gt;

</span><span class="cx">                     &lt;match url=&quot;.&quot; ignoreCase=&quot;false&quot; /&gt;

</span><span class="lines">@@ -456,8 +455,7 @@

</span><span class="cx">             &lt;/rules&gt;

</span><span class="cx">         &lt;/rewrite&gt;

</span><span class="cx">     &lt;/system.webServer&gt;

</span><del>-&lt;/configuration&gt;

-EOF;

</del><ins>+&lt;/configuration&gt;';

</ins><span class="cx"> 

</span><span class="cx">         ?&gt;

</span><span class="cx">                 &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:' ), $home_path ); ?&gt;&lt;/p&gt;

</span></span></pre>

</div>

</div>


</body>

</html>