From b079b8cda8db59f9d4a995428404f6969d1a1c52 Mon Sep 17 00:00:00 2001 From: rMalie Date: Mon, 2 Jan 2012 13:47:03 +0000 Subject: [PATCH] // Fix htaccess generation --- classes/Tools.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/Tools.php b/classes/Tools.php index 93a96951b..5449b8f60 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -1512,9 +1512,6 @@ class ToolsCore if (defined('PS_INSTALLATION_IN_PROGRESS')) return true; - if (!Configuration::get('PS_REWRITING_SETTINGS')) - return true; - // Default values for parameters if (is_null($path)) $path = _PS_ROOT_DIR_.'/.htaccess'; @@ -1525,6 +1522,9 @@ class ToolsCore if (is_null($disable_multiviews)) $disable_multiviews = (int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS'); + if (!$rewrite_settings && !Shop::isFeatureActive()) + return true; + // Check current content of .htaccess and save all code outside of prestashop comments $specific_before = $specific_after = ''; if (file_exists($path))