From c249403c169c5108bada450f5766cc664eb66a7b Mon Sep 17 00:00:00 2001 From: Garvin Hicking Date: Mon, 16 Mar 2015 10:15:55 +0100 Subject: [PATCH] * Adapt .htaccess profile of "mod_rewrite for 1&1 and problematic servers" to not include the "Options -MultiViews" option, since this is often blocked --- docs/NEWS | 4 ++++ include/tpl/htaccess_cgi_rewrite2.tpl | 1 - include/tpl/htaccess_rewrite2.tpl | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/NEWS b/docs/NEWS index c599bd85..26913cdd 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -39,6 +39,10 @@ Version 2.1 () Version 2.0.2 () ------------------------------------------------------------------------ + * Adapt .htaccess profile of "mod_rewrite for 1&1 and problematic + servers" to not include the "Options -MultiViews" option, since + this is often blocked + * Fix initializing smarty framework in the preview/saving iframe, so that a template's config.inc.php is always loaded. diff --git a/include/tpl/htaccess_cgi_rewrite2.tpl b/include/tpl/htaccess_cgi_rewrite2.tpl index 8d54f2b8..68251361 100644 --- a/include/tpl/htaccess_cgi_rewrite2.tpl +++ b/include/tpl/htaccess_cgi_rewrite2.tpl @@ -1,7 +1,6 @@ # BEGIN s9y ErrorDocument 404 {PREFIX}{indexFile} DirectoryIndex {PREFIX}{indexFile} -Options -MultiViews RewriteEngine On RewriteBase {PREFIX} diff --git a/include/tpl/htaccess_rewrite2.tpl b/include/tpl/htaccess_rewrite2.tpl index 77b39953..1e84cf70 100644 --- a/include/tpl/htaccess_rewrite2.tpl +++ b/include/tpl/htaccess_rewrite2.tpl @@ -3,7 +3,6 @@ ErrorDocument 404 {PREFIX}{indexFile} DirectoryIndex {PREFIX}{indexFile} php_value session.use_trans_sid 0 php_value register_globals off -Options -MultiViews RewriteEngine On RewriteBase {PREFIX}