Ticket #18079: respect_site_path.diff
| File respect_site_path.diff, 5.2 KB (added by , 13 years ago) |
|---|
-
wp-admin/network.php
438 438 <action type="None" /> 439 439 </rule> 440 440 <rule name="WordPress Rule 2" stopProcessing="true"> 441 <match url="^([_0-9a-zA-Z -]+/)?files/(.+)" ignoreCase="false" />441 <match url="^([_0-9a-zA-Z/-]+/)?files/(.+)" ignoreCase="false" /> 442 442 <action type="Rewrite" url="wp-includes/ms-files.php?file={R:2}" appendQueryString="false" /> 443 443 </rule> 444 444 <rule name="WordPress Rule 3" stopProcessing="true"> 445 <match url="^([_0-9a-zA-Z -]+/)?wp-admin$" ignoreCase="false" />445 <match url="^([_0-9a-zA-Z/-]+/)?wp-admin$" ignoreCase="false" /> 446 446 <action type="Redirect" url="{R:1}wp-admin/" redirectType="Permanent" /> 447 447 </rule> 448 448 <rule name="WordPress Rule 4" stopProcessing="true"> … … 454 454 <action type="None" /> 455 455 </rule> 456 456 <rule name="WordPress Rule 5" stopProcessing="true"> 457 <match url="^[_0-9a-zA-Z -]+/(wp-(content|admin|includes).*)" ignoreCase="false" />457 <match url="^[_0-9a-zA-Z/-]+/(wp-(content|admin|includes).*)" ignoreCase="false" /> 458 458 <action type="Rewrite" url="{R:2}" /> 459 459 </rule> 460 460 <rule name="WordPress Rule 6" stopProcessing="true"> 461 <match url="^([_0-9a-zA-Z -]+/)?(.*\.php)$" ignoreCase="false" />461 <match url="^([_0-9a-zA-Z/-]+/)?(.*\.php)$" ignoreCase="false" /> 462 462 <action type="Rewrite" url="{R:2}" /> 463 463 </rule> 464 464 <rule name="WordPress Rule 7" stopProcessing="true"> … … 484 484 RewriteRule ^index\.php$ - [L] 485 485 486 486 # uploaded files 487 RewriteRule ^' . ( $subdomain_install ? '' : '([_0-9a-zA-Z -]+/)?' ) . 'files/(.+) wp-includes/ms-files.php?file=$' . ( $subdomain_install ? 1 : 2 ) . ' [L]' . "\n";487 RewriteRule ^' . ( $subdomain_install ? '' : '([_0-9a-zA-Z/-]+/)?' ) . 'files/(.+) wp-includes/ms-files.php?file=$' . ( $subdomain_install ? 1 : 2 ) . ' [L]' . "\n"; 488 488 489 489 if ( ! $subdomain_install ) 490 $htaccess_file .= "\n# add a trailing slash to /wp-admin\n" . 'RewriteRule ^([_0-9a-zA-Z -]+/)?wp-admin$ $1wp-admin/ [R=301,L]' . "\n";490 $htaccess_file .= "\n# add a trailing slash to /wp-admin\n" . 'RewriteRule ^([_0-9a-zA-Z/-]+/)?wp-admin$ $1wp-admin/ [R=301,L]' . "\n"; 491 491 492 492 $htaccess_file .= "\n" . 'RewriteCond %{REQUEST_FILENAME} -f [OR] 493 493 RewriteCond %{REQUEST_FILENAME} -d … … 495 495 496 496 // @todo custom content dir. 497 497 if ( ! $subdomain_install ) 498 $htaccess_file .= "\nRewriteRule ^[_0-9a-zA-Z -]+/(wp-(content|admin|includes).*) $1 [L]\nRewriteRule ^[_0-9a-zA-Z-]+/(.*\.php)$ $1 [L]";498 $htaccess_file .= "\nRewriteRule ^[_0-9a-zA-Z/-]+/(wp-(content|admin|includes).*) $1 [L]\nRewriteRule ^[_0-9a-zA-Z/-]+/(.*\.php)$ $1 [L]"; 499 499 500 500 $htaccess_file .= "\nRewriteRule . index.php [L]"; 501 501 -
wp-admin/network/site-new.php
56 56 57 57 if ( is_subdomain_install() ) { 58 58 $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain ); 59 $path = $ base;59 $path = $current_site->path; 60 60 } else { 61 61 $newdomain = $current_site->domain; 62 $path = $ base. $domain . '/';62 $path = $current_site->path . $domain . '/'; 63 63 } 64 64 65 65 $password = 'N/A'; -
wp-includes/rewrite.php
1739 1739 <action type="None" /> 1740 1740 </rule> 1741 1741 <rule name="wordpress - Rule 2" stopProcessing="true"> 1742 <match url="^([_0-9a-zA-Z -]+/)?files/(.+)" ignoreCase="false" />1742 <match url="^([_0-9a-zA-Z/-]+/)?files/(.+)" ignoreCase="false" /> 1743 1743 <action type="Rewrite" url="wp-includes/ms-files.php?file={R:2}" appendQueryString="false" /> 1744 1744 </rule> 1745 1745 <rule name="wordpress - Rule 3" stopProcessing="true"> 1746 <match url="^([_0-9a-zA-Z -]+/)?wp-admin$" ignoreCase="false" />1746 <match url="^([_0-9a-zA-Z/-]+/)?wp-admin$" ignoreCase="false" /> 1747 1747 <action type="Redirect" url="{R:1}wp-admin/" redirectType="Permanent" /> 1748 1748 </rule> 1749 1749 <rule name="wordpress - Rule 4" stopProcessing="true"> … … 1755 1755 <action type="None" /> 1756 1756 </rule> 1757 1757 <rule name="wordpress - Rule 5" stopProcessing="true"> 1758 <match url="^([_0-9a-zA-Z -]+/)?(wp-(content|admin|includes).*)" ignoreCase="false" />1758 <match url="^([_0-9a-zA-Z/-]+/)?(wp-(content|admin|includes).*)" ignoreCase="false" /> 1759 1759 <action type="Rewrite" url="{R:2}" /> 1760 1760 </rule> 1761 1761 <rule name="wordpress - Rule 6" stopProcessing="true"> 1762 <match url="^([_0-9a-zA-Z -]+/)?(.*\.php)$" ignoreCase="false" />1762 <match url="^([_0-9a-zA-Z/-]+/)?(.*\.php)$" ignoreCase="false" /> 1763 1763 <action type="Rewrite" url="{R:2}" /> 1764 1764 </rule> 1765 1765 <rule name="wordpress - Rule 7" stopProcessing="true">