// Fix htaccess generation

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))