Ticket #15083: 15083.diff

wp-admin/network.php

@@ -471 +471 @@
 
                 // @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]";