Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-08-20 16:40:14 +02:00
parent 44655ecdef 787bf75304
commit 17be1e7528
35 changed files with 1772 additions and 1718 deletions
@@ -157,6 +157,7 @@ class HelperFormCore extends Helper
 			'identifier' => $this->identifier,
 			'name_controller' => $this->name_controller,
 			'languages' => $this->languages,
+			'current_id_lang' => $this->context->language->id,
 			'defaultFormLanguage' => $this->default_form_language,
 			'allowEmployeeFormLang' => $this->allow_employee_form_lang,
 			'form_id' => $this->id,