Changeset 21823 for trunk/wp-includes/rewrite.php

Timestamp:

09/11/2012 10:22:20 PM (12 years ago)

Author:

nacin

Message:

Remove ms-files.php rewriting from WordPress multisite. fixes #19235.

Keep existing networks compatible with a ms_files_rewriting network option.

File:

• trunk/wp-includes/rewrite.php (modified) (4 diffs)

trunk/wp-includes/rewrite.php

@@ -1743 +1743 @@
             if (is_subdomain_install()) {
                 $rules .= '
-                <rule name="wordpress - Rule 1" stopProcessing="true">
+                <rule name="WordPress Rule 1" stopProcessing="true">
                     <match url="^index\.php$" ignoreCase="false" />
                     <action type="None" />
-                </rule>
-                <rule name="wordpress - Rule 2" stopProcessing="true">
+                </rule>';
+                if ( get_site_option( 'ms_files_rewriting' ) ) {
+                    $rules .= '
+                <rule name="WordPress Rule for Files" stopProcessing="true">
                     <match url="^files/(.+)" ignoreCase="false" />
                     <action type="Rewrite" url="wp-includes/ms-files.php?file={R:1}" appendQueryString="false" />
-                </rule>
-                <rule name="wordpress - Rule 3" stopProcessing="true">
+                </rule>';
+                }
+                $rules .= '
+                <rule name="WordPress Rule 2" stopProcessing="true">
                     <match url="^" ignoreCase="false" />
                     <conditions logicalGrouping="MatchAny">
@@ -1759 +1763 @@
                     <action type="None" />
                 </rule>
-                <rule name="wordpress - Rule 4" stopProcessing="true">
+                <rule name="WordPress Rule 3" stopProcessing="true">
                     <match url="." ignoreCase="false" />
                     <action type="Rewrite" url="index.php" />
@@ -1765 +1769 @@
             } else {
                 $rules .= '
-                <rule name="wordpress - Rule 1" stopProcessing="true">
+                <rule name="WordPress Rule 1" stopProcessing="true">
                     <match url="^index\.php$" ignoreCase="false" />
                     <action type="None" />
-                </rule>
-                <rule name="wordpress - Rule 2" stopProcessing="true">
+                </rule>';
+                if ( get_site_option( 'ms_files_rewriting' ) ) {
+                    $rules .= '
+                <rule name="WordPress Rule for Files" stopProcessing="true">
                     <match url="^([_0-9a-zA-Z-]+/)?files/(.+)" ignoreCase="false" />
                     <action type="Rewrite" url="wp-includes/ms-files.php?file={R:2}" appendQueryString="false" />
-                </rule>
-                <rule name="wordpress - Rule 3" stopProcessing="true">
+                </rule>';
+                }
+                $rules .= '
+                <rule name="WordPress Rule 2" stopProcessing="true">
                     <match url="^([_0-9a-zA-Z-]+/)?wp-admin$" ignoreCase="false" />
                     <action type="Redirect" url="{R:1}wp-admin/" redirectType="Permanent" />
                 </rule>
-                <rule name="wordpress - Rule 4" stopProcessing="true">
+                <rule name="WordPress Rule 3" stopProcessing="true">
                     <match url="^" ignoreCase="false" />
                     <conditions logicalGrouping="MatchAny">
@@ -1785 +1793 @@
                     <action type="None" />
                 </rule>
-                <rule name="wordpress - Rule 5" stopProcessing="true">
+                <rule name="WordPress Rule 4" stopProcessing="true">
                     <match url="^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*)" ignoreCase="false" />
                     <action type="Rewrite" url="{R:1}" />
                 </rule>
-                <rule name="wordpress - Rule 6" stopProcessing="true">
+                <rule name="WordPress Rule 5" stopProcessing="true">
                     <match url="^([_0-9a-zA-Z-]+/)?(.*\.php)$" ignoreCase="false" />
                     <action type="Rewrite" url="{R:2}" />
                 </rule>
-                <rule name="wordpress - Rule 7" stopProcessing="true">
+                <rule name="WordPress Rule 6" stopProcessing="true">
                     <match url="." ignoreCase="false" />
                     <action type="Rewrite" url="index.php" />