Avoid extra conditional in the subdirectory rewrite rules. props wpmuguru, fixes #15083.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15949 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
614dd3b3a9
commit
750243a0cd
|
@ -430,7 +430,7 @@ define( 'BLOG_ID_CURRENT_SITE', 1 );</textarea>
|
||||||
<action type="None" />
|
<action type="None" />
|
||||||
</rule>
|
</rule>
|
||||||
<rule name="WordPress Rule 5" stopProcessing="true">
|
<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}" />
|
<action type="Rewrite" url="{R:2}" />
|
||||||
</rule>
|
</rule>
|
||||||
<rule name="WordPress Rule 6" stopProcessing="true">
|
<rule name="WordPress Rule 6" stopProcessing="true">
|
||||||
|
@ -471,7 +471,7 @@ RewriteRule ^ - [L]';
|
||||||
|
|
||||||
// @todo custom content dir.
|
// @todo custom content dir.
|
||||||
if ( ! $subdomain_install )
|
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]";
|
$htaccess_file .= "\nRewriteRule . index.php [L]";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue