WordPress.org

Make WordPress Core

Changeset 23177


Ignore:
Timestamp:
12/13/2012 10:54:36 PM (5 years ago)
Author:
markjaquith
Message:

Fix code vomit in IIS rewrite rule generation. fixes #22920 for trunk. props toscho.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/network.php

    r22982 r23177  
    412412        $iis_subdir_replacement = $subdomain_install ? '' : '{R:1}';
    413413
    414         $web_config_file = <<<EOF
    415 <?xml version="1.0" encoding="UTF-8"?>
     414        $web_config_file = '<?xml version="1.0" encoding="UTF-8"?>
    416415<configuration>
    417416    <system.webServer>
     
    425424                    $web_config_file .= '
    426425                <rule name="WordPress Rule for Files" stopProcessing="true">
    427                     <match url="^{$iis_subdir_match}files/(.+)" ignoreCase="false" />
    428                     <action type="Rewrite" url="{$iis_rewrite_base}wp-includes/ms-files.php?file={R:1}" appendQueryString="false" />
     426                    <match url="^' . $iis_subdir_match . 'files/(.+)" ignoreCase="false" />
     427                    <action type="Rewrite" url="' . $iis_rewrite_base . 'wp-includes/ms-files.php?file={R:1}" appendQueryString="false" />
    429428                </rule>';
    430429                }
    431430                $web_config_file .= '
    432431                <rule name="WordPress Rule 2" stopProcessing="true">
    433                     <match url="^{$iis_subdir_match}wp-admin$" ignoreCase="false" />
    434                     <action type="Redirect" url="{$iis_subdir_replacement}wp-admin/" redirectType="Permanent" />
     432                    <match url="^' . $iis_subdir_match . 'wp-admin$" ignoreCase="false" />
     433                    <action type="Redirect" url="' . $iis_subdir_replacement . 'wp-admin/" redirectType="Permanent" />
    435434                </rule>
    436435                <rule name="WordPress Rule 3" stopProcessing="true">
     
    443442                </rule>
    444443                <rule name="WordPress Rule 4" stopProcessing="true">
    445                     <match url="^{$iis_subdir_match}(wp-(content|admin|includes).*)" ignoreCase="false" />
    446                     <action type="Rewrite" url="{$iis_rewrite_base}{R:1}" />
     444                    <match url="^' . $iis_subdir_match . '(wp-(content|admin|includes).*)" ignoreCase="false" />
     445                    <action type="Rewrite" url="' . $iis_rewrite_base . '{R:1}" />
    447446                </rule>
    448447                <rule name="WordPress Rule 5" stopProcessing="true">
    449                     <match url="^{$iis_subdir_match}([_0-9a-zA-Z-]+/)?(.*\.php)$" ignoreCase="false" />
    450                     <action type="Rewrite" url="{$iis_rewrite_base}{R:2}" />
     448                    <match url="^' . $iis_subdir_match . '([_0-9a-zA-Z-]+/)?(.*\.php)$" ignoreCase="false" />
     449                    <action type="Rewrite" url="' . $iis_rewrite_base . '{R:2}" />
    451450                </rule>
    452451                <rule name="WordPress Rule 6" stopProcessing="true">
     
    457456        </rewrite>
    458457    </system.webServer>
    459 </configuration>
    460 EOF;
     458</configuration>';
    461459
    462460    ?>
Note: See TracChangeset for help on using the changeset viewer.