refs #1828 : bugfix - correct setup.php rewrite file

setup.php

@@ -1385,7 +1385,7 @@ function fail($msg) {
 			case 'ISAPI':
 				// Users must copy these rules to IsapiRewrite4.ini
 				$htaccessContent = <<<EOF
-RewriteRule ^{$path}/(thumbnail)/([0-9]+/.+)\$ {$path}/cache/\$1/\$2 [L,U]
+RewriteRule ^{$path}/(thumbnail)/([0-9]+/.+)\$ {$path}/user/cache/\$1/\$2 [L,U]
 RewriteRule ^{$path}/attach/([0-9]+/.+)\$ {$path}/user/attach/\$1 [L,U]
 RewriteCond %{REQUEST_FILENAME} -f
 RewriteRule ^{$path}/user+/+(cache)+/+(.+[^/]).(cache|xml|txt|log)\$ - [NC,F,L,U]
@@ -1400,7 +1400,7 @@ function fail($msg) {
 			case 'IISRewrite':
 				// Users must import these rules into URL Rewrite module.
 				$htaccessContent = <<<EOF
-RewriteRule ^{$path}/(thumbnail)/([0-9]+/.+)\$ {$path}/cache/\$1/\$2 [L]
+RewriteRule ^{$path}/(thumbnail)/([0-9]+/.+)\$ {$path}/user/cache/\$1/\$2 [L]
 RewriteRule ^{$path}/attach/([0-9]+/.+)\$ {$path}/user/attach/\$1 [L]
 RewriteCond %{REQUEST_FILENAME} -f
 RewriteRule ^{$path}/user+/+(cache)+/+(.+[^/]).(cache|xml|txt|log)\$ - [NC,F,L]
@@ -1419,7 +1419,7 @@ function fail($msg) {
 #SetEnv PRELOAD_CONFIG 1
 RewriteEngine On
 RewriteBase {$path}/
-RewriteRule ^(thumbnail)/([0-9]+/.+)\$ cache/\$1/\$2 [L]
+RewriteRule ^(thumbnail)/([0-9]+/.+)\$ user/cache/\$1/\$2 [L]
 RewriteRule ^attach/([0-9]+/.+)\$ user/attach/\$1 [L]
 RewriteCond %{REQUEST_FILENAME} -f
 RewriteRule ^user+/+(cache)+/+(.+[^/]).(cache|xml|txt|log)\$ - [NC,F,L]