patch up rewrite rule so that index.php may not get rewritten to index.php?url=index...

(Even though it didn't happen on my install...anyways, the rewrite rule also only steps into effect if $serendipity['indexFile'] != 'index.php', we may want to create a conditional rule here.

diff --git a/include/tpl/htaccess_cgi_rewrite.tpl b/include/tpl/htaccess_cgi_rewrite.tpl
index b9c4429dca99c5ed5a0a08d49a12889c7f6aa621..860c2f05b9715c57700d412cd884ddbb3300205b 100644 (file)
--- a/include/tpl/htaccess_cgi_rewrite.tpl
+++ b/include/tpl/htaccess_cgi_rewrite.tpl
@@ -18,7 +18,7 @@ RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA]
 RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
 RewriteRule ^{PAT_CSS} {indexFile}?url=/$1 [L,QSA]
 RewriteRule ^{PAT_AUTHORS} {indexFile}?url=/{PATH_AUTHORS}/$1 [L,QSA]
-RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
+RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]
 

diff --git a/include/tpl/htaccess_rewrite.tpl b/include/tpl/htaccess_rewrite.tpl
index 26ea1e450db3371592097960fcca017ebba9801d..6e863a4feea2038e541d8e17ff8be2288b186277 100644 (file)
--- a/include/tpl/htaccess_rewrite.tpl
+++ b/include/tpl/htaccess_rewrite.tpl
@@ -20,7 +20,7 @@ RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA]
 RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
 RewriteRule ^{PAT_CSS} {indexFile}?url=/$1 [L,QSA]
 RewriteRule ^{PAT_AUTHORS} {indexFile}?url=/{PATH_AUTHORS}/$1 [L,QSA]
-RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
+RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]