// Renamed defaultLanguage in id_lang_default in order to avoid conflict with an object #PSCFV-3780

This commit is contained in:
dMetzger
2012-08-29 09:55:39 +00:00
parent 9f52c3c2a4
commit 69d5329cb7
12 changed files with 79 additions and 82 deletions
@@ -549,7 +549,7 @@ class AdminCartRulesControllerCore extends AdminController
'gift_product_attribute_select' => $gift_product_attribute_select,
'reductionProductFilter' => $reduction_product_filter,
'defaultCurrency' => Configuration::get('PS_CURRENCY_DEFAULT'),
'defaultLanguage' => Configuration::get('PS_LANG_DEFAULT'),
'id_lang_default' => Configuration::get('PS_LANG_DEFAULT'),
'languages' => $languages,
'currencies' => $currencies,
'countries' => $countries,