dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCartRulesController.php
+1 -1
View File
@@ -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,
controllers/admin/AdminProductsController.php
+1 -1
View File
@@ -2318,7 +2318,7 @@ class AdminProductsControllerCore extends AdminController
$this->getLanguages();
$this->tpl_form_vars['defaultLanguage'] = Configuration::get('PS_LANG_DEFAULT');
$this->tpl_form_vars['id_lang_default'] = Configuration::get('PS_LANG_DEFAULT');
$this->tpl_form_vars['currentIndex'] = self::$currentIndex;
$this->tpl_form_vars['display_multishop_checkboxes'] = (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP && $this->display == 'edit');