Changeset 15949

Timestamp:

10/24/2010 09:09:33 PM (14 years ago)

Author:

nacin

Message:

Avoid extra conditional in the subdirectory rewrite rules. props wpmuguru, fixes #15083.

File:

• trunk/wp-admin/network.php (modified) (2 diffs)

trunk/wp-admin/network.php

@@ -431 +431 @@
                 </rule>
                 <rule name="WordPress Rule 5" stopProcessing="true">
-                    <match url="^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*)" ignoreCase="false" />
+                    <match url="^[_0-9a-zA-Z-]+/(wp-(content|admin|includes).*)" ignoreCase="false" />
                     <action type="Rewrite" url="{R:2}" />
                 </rule>
@@ -472 +472 @@
         // @todo custom content dir.
         if ( ! $subdomain_install )
-            $htaccess_file .= "\nRewriteRule  ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]\nRewriteRule  ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]";
+            $htaccess_file .= "\nRewriteRule  ^[_0-9a-zA-Z-]+/(wp-(content|admin|includes).*) $1 [L]\nRewriteRule  ^[_0-9a-zA-Z-]+/(.*\.php)$ $1 [L]";
 
         $htaccess_file .= "\nRewriteRule . index.php [L]";