[-] Classes: Tools::generateHtaccess() can be called without its arguments (use default configuration settings)

This commit is contained in:
rMalie
2011-12-29 10:54:48 +00:00
parent 8ce8f166e1
commit b5240ce83f
5 changed files with 28 additions and 81 deletions
+3 -18
View File
@@ -124,12 +124,7 @@ class MetaCore extends ObjectModel
if (!parent::update($nullValues))
return false;
return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)Configuration::get('PS_REWRITING_SETTINGS'),
(int)Configuration::get('PS_HTACCESS_CACHE_CONTROL'),
'',
(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
);
return Tools::generateHtaccess();
}
public function delete()
@@ -137,12 +132,7 @@ class MetaCore extends ObjectModel
if (!parent::delete())
return false;
return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)Configuration::get('PS_REWRITING_SETTINGS'),
(int)Configuration::get('PS_HTACCESS_CACHE_CONTROL'),
'',
(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
);
return Tools::generateHtaccess();
}
public function deleteSelection($selection)
@@ -156,12 +146,7 @@ class MetaCore extends ObjectModel
$result = $result AND $this->delete();
}
return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)Configuration::get('PS_REWRITING_SETTINGS'),
(int)Configuration::get('PS_HTACCESS_CACHE_CONTROL'),
'',
(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
);
return Tools::generateHtaccess();
}
public static function getEquivalentUrlRewrite($new_id_lang, $id_lang, $url_rewrite)