From af6c267354ac7c0d7f2d1aa3d2f098a777b2c290 Mon Sep 17 00:00:00 2001 From: Garvin Hicking Date: Mon, 2 Jun 2008 07:40:28 +0000 Subject: [PATCH] Once again, with feeling. --- include/tpl/htaccess_cgi_rewrite.tpl | 2 +- include/tpl/htaccess_rewrite.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tpl/htaccess_cgi_rewrite.tpl b/include/tpl/htaccess_cgi_rewrite.tpl index 76e6e203..2933b122 100644 --- a/include/tpl/htaccess_cgi_rewrite.tpl +++ b/include/tpl/htaccess_cgi_rewrite.tpl @@ -23,9 +23,9 @@ RewriteRule ^{PAT_PLUGIN} {indexFile}?url=$1/$2 [L,QSA] RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA] RewriteRule ^{PAT_COMMENTS} {indexFile}?url=/{PATH_COMMENTS}/$1 [L,QSA] RewriteRule ^{PAT_CSS} {indexFile}?url=/$1 [L,QSA] -RewriteCond %{REQUEST_URI} !-U RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA] RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA] +RewriteCond %{REQUEST_URI} !-U RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA] diff --git a/include/tpl/htaccess_rewrite.tpl b/include/tpl/htaccess_rewrite.tpl index 94d8535f..81abccb9 100644 --- a/include/tpl/htaccess_rewrite.tpl +++ b/include/tpl/htaccess_rewrite.tpl @@ -25,9 +25,9 @@ RewriteRule ^{PAT_PLUGIN} {indexFile}?url=$1/$2 [L,QSA] RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA] RewriteRule ^{PAT_COMMENTS} {indexFile}?url=/{PATH_COMMENTS}/$1 [L,QSA] RewriteRule ^{PAT_CSS} {indexFile}?url=/$1 [L,QSA] -RewriteCond %{REQUEST_URI} !-U RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA] RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA] +RewriteCond %{REQUEST_URI} !-U RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]