diff --git a/admin-dev/tabs/AdminGenerator.php b/admin-dev/tabs/AdminGenerator.php
index f5177483b..4eb479a17 100644
--- a/admin-dev/tabs/AdminGenerator.php
+++ b/admin-dev/tabs/AdminGenerator.php
@@ -67,12 +67,6 @@ class AdminGenerator extends AdminTab
'.$this->l('Enable this option only if you have problems with some pages URL rewriting.').'
-
-
-
'.$this->l('Generate your ".htaccess" file by clicking on the following button:').'
'.$this->l('This will erase your').' '.$this->l('old').' '.$this->l('.htaccess file!').'
';
@@ -119,8 +113,7 @@ class AdminGenerator extends AdminTab
Configuration::updateValue('PS_HTACCESS_CACHE_CONTROL', (int)Tools::getValue('PS_HTACCESS_CACHE_CONTROL'));
Configuration::updateValue('PS_REWRITING_SETTINGS', (int)Tools::getValue('PS_REWRITING_SETTINGS'));
Configuration::updateValue('PS_HTACCESS_DISABLE_MULTIVIEWS', (int)Tools::getValue('PS_HTACCESS_DISABLE_MULTIVIEWS'));
- Configuration::updateValue('PS_HTACCESS_SPECIFIC', Tools::getValue('ps_htaccess_specific'), true);
- if (Tools::generateHtaccess($this->_htFile, Configuration::get('PS_REWRITING_SETTINGS'), Configuration::get('PS_HTACCESS_CACHE_CONTROL'), Tools::getValue('ps_htaccess_specific'), Tools::getValue('PS_HTACCESS_DISABLE_MULTIVIEWS')))
+ if (Tools::generateHtaccess($this->_htFile, Configuration::get('PS_REWRITING_SETTINGS'), Configuration::get('PS_HTACCESS_CACHE_CONTROL'), '', Tools::getValue('PS_HTACCESS_DISABLE_MULTIVIEWS')))
Tools::redirectAdmin(self::$currentIndex.'&conf=4&token='.$this->token);
$this->_errors[] = $this->l('Cannot write into file:').' '.$this->_htFile.'
'.$this->l('Please check write permissions.');
}
diff --git a/admin-dev/tabs/AdminShopUrl.php b/admin-dev/tabs/AdminShopUrl.php
index 9aa6730c5..85c0cee1b 100755
--- a/admin-dev/tabs/AdminShopUrl.php
+++ b/admin-dev/tabs/AdminShopUrl.php
@@ -64,7 +64,7 @@ class AdminShopUrl extends AdminTab
if ($object->canAddThisUrl(Tools::getValue('domain'), Tools::getValue('domain_ssl'), Tools::getValue('uri')))
$this->_errors[] = Tools::displayError('A shop url that use this domain and uri already exists');
- Tools::generateHtaccess(dirname(__FILE__).'/../../.htaccess', Configuration::get('PS_REWRITING_SETTINGS'), Configuration::get('PS_HTACCESS_CACHE_CONTROL'), Configuration::get('PS_HTACCESS_SPECIFIC'));
+ Tools::generateHtaccess(dirname(__FILE__).'/../../.htaccess', Configuration::get('PS_REWRITING_SETTINGS'), Configuration::get('PS_HTACCESS_CACHE_CONTROL'), '');
}
return parent::postProcess();
}
diff --git a/classes/Language.php b/classes/Language.php
index 5ce90ddce..2ee600125 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -107,7 +107,7 @@ class LanguageCore extends ObjectModel
return ($resUpdateSQL AND Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
- Configuration::get('PS_HTACCESS_SPECIFIC'),
+ '',
(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
));
}
@@ -123,7 +123,7 @@ class LanguageCore extends ObjectModel
return (Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
- Configuration::get('PS_HTACCESS_SPECIFIC'),
+ '',
(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
));
}
@@ -410,7 +410,7 @@ class LanguageCore extends ObjectModel
return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
- Configuration::get('PS_HTACCESS_SPECIFIC'),
+ '',
(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
);
}
@@ -434,7 +434,7 @@ class LanguageCore extends ObjectModel
Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
- Configuration::get('PS_HTACCESS_SPECIFIC'),
+ '',
(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
);
@@ -575,7 +575,7 @@ class LanguageCore extends ObjectModel
return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
- Configuration::get('PS_HTACCESS_SPECIFIC'),
+ '',
(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
);
}
diff --git a/classes/Meta.php b/classes/Meta.php
index adb6b5400..27d8d9e6a 100644
--- a/classes/Meta.php
+++ b/classes/Meta.php
@@ -132,7 +132,7 @@ class MetaCore extends ObjectModel
return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
- Configuration::get('PS_HTACCESS_SPECIFIC')
+ ''
);
}
@@ -143,7 +143,7 @@ class MetaCore extends ObjectModel
return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
- Configuration::get('PS_HTACCESS_SPECIFIC')
+ ''
);
}
@@ -155,7 +155,7 @@ class MetaCore extends ObjectModel
return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
- Configuration::get('PS_HTACCESS_SPECIFIC')
+ ''
);
}
@@ -173,7 +173,7 @@ class MetaCore extends ObjectModel
return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
- Configuration::get('PS_HTACCESS_SPECIFIC')
+ ''
);
}
diff --git a/install-dev/classes/Language.php b/install-dev/classes/Language.php
index 934ff264b..ebe62cd70 100644
--- a/install-dev/classes/Language.php
+++ b/install-dev/classes/Language.php
@@ -107,7 +107,7 @@ class Language extends ObjectModel
return ($resUpdateSQL AND Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
- Configuration::get('PS_HTACCESS_SPECIFIC')
+ ''
));
}
@@ -122,7 +122,7 @@ class Language extends ObjectModel
return (Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
- Configuration::get('PS_HTACCESS_SPECIFIC')
+ ''
));
}
@@ -407,7 +407,7 @@ class Language extends ObjectModel
return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
- Configuration::get('PS_HTACCESS_SPECIFIC')
+ ''
);
}
@@ -430,7 +430,7 @@ class Language extends ObjectModel
Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
- Configuration::get('PS_HTACCESS_SPECIFIC')
+ ''
);
return $result;
@@ -562,7 +562,7 @@ class Language extends ObjectModel
return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
- Configuration::get('PS_HTACCESS_SPECIFIC')
+ ''
);
}