From 83053fa0358b07b2e959e460671cf48e0639bf5f Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Thu, 16 Feb 2012 14:23:07 +0000 Subject: [PATCH] // [-] BO : #PSTEST-769 - Use context instead of the Configuration::get() git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13394 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/helper/HelperForm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/helper/HelperForm.php b/classes/helper/HelperForm.php index fb9d670f7..b9d67f98d 100644 --- a/classes/helper/HelperForm.php +++ b/classes/helper/HelperForm.php @@ -160,7 +160,7 @@ class HelperFormCore extends Helper 'form_id' => $this->id, 'fields' => $this->fields_form, 'fields_value' => $this->fields_value, - 'default_country' => (int)(Configuration::get('PS_SHOP_COUNTRY_ID') ? Configuration::get('PS_SHOP_COUNTRY_ID') : Configuration::get('PS_COUNTRY_DEFAULT')), + 'default_country' => (int)$this->context->country->id, 'required_fields' => $this->getFieldsRequired(), 'vat_number' => file_exists(_PS_MODULE_DIR_.'vatnumber/ajax.php'), 'module_dir' => _MODULE_DIR_,