From 750243a0cdf7bb78c630b274634218e0ff78a2ad Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 24 Oct 2010 21:09:33 +0000
Subject: [PATCH] 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
---
 wp-admin/network.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-admin/network.php b/wp-admin/network.php
index faea32adb..5817ac25f 100644
--- a/wp-admin/network.php
+++ b/wp-admin/network.php
@@ -430,7 +430,7 @@ define( 'BLOG_ID_CURRENT_SITE', 1 );</textarea>
                     <action type="None" />
                 </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>
                 <rule name="WordPress Rule 6" stopProcessing="true">
@@ -471,7 +471,7 @@ RewriteRule ^ - [L]';
 
 		// @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]";