<!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>[12700] trunk/wp-includes/rewrite.php: Formatting cleanup</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12700">12700</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-11 22:30:21 +0000 (Mon, 11 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Formatting cleanup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (12699 => 12700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php 2010-01-11 22:23:58 UTC (rev 12699)
+++ trunk/wp-includes/rewrite.php 2010-01-11 22:30:21 UTC (rev 12700)
</span><span class="lines">@@ -1725,77 +1725,77 @@
</span><span class="cx"> return '';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if( !is_multisite() ) {
- $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;
- }
</del><ins>+ if ( !is_multisite() ) {
+ $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 .= $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>";
+
+ 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>";
+ }
+ } else {
+ $rules = '<rule name="wordpress - strip index.php" stopProcessing="false">
+ <match url="^index.php/(.*)$" />
+ <action type="Rewrite" url="{R:1}" />
+ </rule>
+ <rule name="wordpress - 1" stopProcessing="true">
+ <match url="^(.*/)?files/$" />
+ <action type="Rewrite" url="index.php" />
+ </rule>
+ <rule name="wordpress - 2" stopProcessing="true">
+ <match url="^(.*/)?files/(.*)" />
+ <conditions>
+ <add input="{REQUEST_URI}" negate="true" pattern=".*wp-content/plugins.*"/>
+ </conditions>
+ <action type="Rewrite" url="wp-content/blogs.php?file={R:2}" appendQueryString="false" />
+ </rule>
+ <rule name="wordpress - 3" stopProcessing="true">
+ <match url="^(.+)$" />
+ <conditions>
+ <add input="{REQUEST_URI}" pattern="^.*/wp-admin$" />
+ </conditions>
+ <action type="Redirect" url="{R:1}/" redirectType="Permanent" />
+ </rule>
+ <rule name="wordpress - 4" stopProcessing="true">
+ <match url="."/>
+ <conditions logicalGrouping="MatchAny">
+ <add input="{REQUEST_FILENAME}" matchType="IsFile" pattern="" />
+ <add input="{REQUEST_FILENAME}" matchType="IsDirectory" pattern="" />
+ </conditions>
+ <action type="None" />
+ </rule>
+ <rule name="wordpress - 5" stopProcessing="true">
+ <match url="^([_0-9a-zA-Z-]+/)?(wp-.*)" />
+ <action type="Rewrite" url="{R:2}" />
+ </rule>
+ <rule name="wordpress - 6" stopProcessing="true">
+ <match url="^([_0-9a-zA-Z-]+/)?(.*\.php)$" />
+ <action type="Rewrite" url="{R:2}" />
+ </rule>
+ <rule name="wordpress - 7" stopProcessing="true">
+ <match url="." />
+ <action type="Rewrite" url="index.php" />
+ </rule>';
+ }
</ins><span class="cx">
</span><del>- $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>";
-
- 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>";
- }
- } else {
- $rules = '<rule name="wordpress - strip index.php" stopProcessing="false">
- <match url="^index.php/(.*)$" />
- <action type="Rewrite" url="{R:1}" />
- </rule>
- <rule name="wordpress - 1" stopProcessing="true">
- <match url="^(.*/)?files/$" />
- <action type="Rewrite" url="index.php" />
- </rule>
- <rule name="wordpress - 2" stopProcessing="true">
- <match url="^(.*/)?files/(.*)" />
- <conditions>
- <add input="{REQUEST_URI}" negate="true" pattern=".*wp-content/plugins.*"/>
- </conditions>
- <action type="Rewrite" url="wp-content/blogs.php?file={R:2}" appendQueryString="false" />
- </rule>
- <rule name="wordpress - 3" stopProcessing="true">
- <match url="^(.+)$" />
- <conditions>
- <add input="{REQUEST_URI}" pattern="^.*/wp-admin$" />
- </conditions>
- <action type="Redirect" url="{R:1}/" redirectType="Permanent" />
- </rule>
- <rule name="wordpress - 4" stopProcessing="true">
- <match url="."/>
- <conditions logicalGrouping="MatchAny">
- <add input="{REQUEST_FILENAME}" matchType="IsFile" pattern="" />
- <add input="{REQUEST_FILENAME}" matchType="IsDirectory" pattern="" />
- </conditions>
- <action type="None" />
- </rule>
- <rule name="wordpress - 5" stopProcessing="true">
- <match url="^([_0-9a-zA-Z-]+/)?(wp-.*)" />
- <action type="Rewrite" url="{R:2}" />
- </rule>
- <rule name="wordpress - 6" stopProcessing="true">
- <match url="^([_0-9a-zA-Z-]+/)?(.*\.php)$" />
- <action type="Rewrite" url="{R:2}" />
- </rule>
- <rule name="wordpress - 7" stopProcessing="true">
- <match url="." />
- <action type="Rewrite" url="index.php" />
- </rule>';
- }
-
</del><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>