golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

IIS rewrite fixes. Props duck_, ruslany. fixes #13679 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15109 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-06-02 14:58:36 +00:00
parent dd66d99477
commit 43c22c1e5b
1 changed files with 69 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wp-includes/rewrite.php
View File

@ -1766,23 +1766,12 @@ class WP_Rewrite {
return ''; return '';
$rules = ''; $rules = '';
if ( $add_parent_tags ) { if ( $add_parent_tags ) {
$rules .= ' $rules .= '<configuration>
<configuration>
<system.webServer> <system.webServer>
<rewrite> <rewrite>
<rules> <rules>';
';
} }
if ( !is_multisite() ) { if ( !is_multisite() ) {
if ( $add_parent_tags ) {
$rules .= '
<configuration>
<system.webServer>
<rewrite>
<rules>
';
}
$rules .= ' $rules .= '
<rule name="wordpress" patternSyntax="Wildcard"> <rule name="wordpress" patternSyntax="Wildcard">
<match url="*" /> <match url="*" />
@ -1791,9 +1780,7 @@ class WP_Rewrite {
<add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" /> <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
</conditions> </conditions>
<action type="Rewrite" url="index.php" /> <action type="Rewrite" url="index.php" />
</rule> </rule>';
';
} else { } else {
if (is_subdomain_install()) { if (is_subdomain_install()) {
$rules .= ' $rules .= '
@ -1816,8 +1803,7 @@ class WP_Rewrite {
<rule name="wordpress - Rule 4" stopProcessing="true"> <rule name="wordpress - Rule 4" stopProcessing="true">
<match url="." ignoreCase="false" /> <match url="." ignoreCase="false" />
<action type="Rewrite" url="index.php" /> <action type="Rewrite" url="index.php" />
</rule> </rule>';
';
} else { } else {
$rules .= ' $rules .= '
<rule name="wordpress - Rule 1" stopProcessing="true"> <rule name="wordpress - Rule 1" stopProcessing="true">
@ -1851,8 +1837,7 @@ class WP_Rewrite {
<rule name="wordpress - Rule 7" stopProcessing="true"> <rule name="wordpress - Rule 7" stopProcessing="true">
<match url="." ignoreCase="false" /> <match url="." ignoreCase="false" />
<action type="Rewrite" url="index.php" /> <action type="Rewrite" url="index.php" />
</rule> </rule>';
';
} }
} }
if ( $add_parent_tags ) { if ( $add_parent_tags ) {
@ -1860,8 +1845,7 @@ class WP_Rewrite {
</rules> </rules>
</rewrite> </rewrite>
</system.webServer> </system.webServer>
</configuration> </configuration>';
';
} }
$rules = apply_filters('iis7_url_rewrite_rules', $rules); $rules = apply_filters('iis7_url_rewrite_rules', $rules);