WordPress.org

Make WordPress Core

Changeset 15949


Ignore:
Timestamp:
10/24/10 21:09:33 (6 years ago)
Author:
nacin
Message:

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

File:
1 edited

Legend:

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

    r15618 r15949  
    431431                </rule> 
    432432                <rule name="WordPress Rule 5" stopProcessing="true"> 
    433                     <match url="^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*)" ignoreCase="false" /> 
     433                    <match url="^[_0-9a-zA-Z-]+/(wp-(content|admin|includes).*)" ignoreCase="false" /> 
    434434                    <action type="Rewrite" url="{R:2}" /> 
    435435                </rule> 
     
    472472        // @todo custom content dir. 
    473473        if ( ! $subdomain_install ) 
    474             $htaccess_file .= "\nRewriteRule  ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]\nRewriteRule  ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]"; 
     474            $htaccess_file .= "\nRewriteRule  ^[_0-9a-zA-Z-]+/(wp-(content|admin|includes).*) $1 [L]\nRewriteRule  ^[_0-9a-zA-Z-]+/(.*\.php)$ $1 [L]"; 
    475475 
    476476        $htaccess_file .= "\nRewriteRule . index.php [L]"; 
Note: See TracChangeset for help on using the changeset viewer.