From f3bd6fff581d3ecb722a581597daf53a0a659f35 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Wed, 9 May 2012 16:50:05 +0000
Subject: [PATCH] [-] BO : fix bug #PSCFV-2239 - js error on product page on
 IIS + PHP5.4

---
 .../template/controllers/products/helpers/form/form.tpl   | 1 -
 controllers/admin/AdminProductsController.php             | 2 +-
 js/admin-products.js                                      | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
index 289376962..d21417ae5 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
@@ -83,7 +83,6 @@
 		var token = '{$token}';
 		var id_product = {if isset($product->id)}{$product->id}{else}0{/if};
 		var defaultLanguage = {$defaultLanguage};
-
 		var product_type_pack = {Product::PTYPE_PACK};
 		var product_type_virtual = {Product::PTYPE_VIRTUAL};
 		var product_type_simple = {Product::PTYPE_SIMPLE};
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index c35308f01..69e461343 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2152,7 +2152,7 @@ class AdminProductsControllerCore extends AdminController
 
 		$this->getLanguages();
 
-		$this->tpl_form_vars['defaultLanguage'] = Language::getLanguage(Configuration::get('PS_LANG_DEFAULT'));
+		$this->tpl_form_vars['defaultLanguage'] = 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');
diff --git a/js/admin-products.js b/js/admin-products.js
index f597d8578..adfc382ae 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -415,12 +415,12 @@ function handleSaveButtons(e)
 	// common for all products
 	// name[defaultlangid]
 	$("#disableSaveMessage").remove();
-	if ($("#name_"+defaultLanguage.id_lang).val() == "" && (!display_multishop_checkboxes || $('input[name=\'multishop_check[name]['+defaultLanguage.id_lang+']\']').prop('checked')))
+	if ($("#name_"+defaultLanguage).val() == "" && (!display_multishop_checkboxes || $('input[name=\'multishop_check[name]['+defaultLanguage+']\']').prop('checked')))
 	{
 		msg[i++] = empty_name_msg;
 	}
 	// check friendly_url_[defaultlangid] only if name is ok
-	else if ($("#link_rewrite_"+defaultLanguage.id_lang).val() == "" && (!display_multishop_checkboxes || $('input[name=\'link_rewrite[name]['+defaultLanguage.id_lang+']\']').prop('checked')))
+	else if ($("#link_rewrite_"+defaultLanguage).val() == "" && (!display_multishop_checkboxes || $('input[name=\'link_rewrite[name]['+defaultLanguage+']\']').prop('checked')))
 		msg[i++] = empty_link_rewrite_msg;
 
 	if (msg.length == 0)
@@ -1543,7 +1543,7 @@ $(document).ready(function() {
 
 	updateCurrentText();
 
-	$("#name_"+defaultLanguage.id_lang+",#link_rewrite_"+defaultLanguage.id_lang)
+	$("#name_"+defaultLanguage+",#link_rewrite_"+defaultLanguage)
 		.live("change", function(e)
 		{
 			if(typeof e == KeyboardEvent)
@@ -1552,7 +1552,7 @@ $(document).ready(function() {
 			$(this).trigger("handleSaveButtons");
 		});
 	// bind that custom event
-	$("#name_"+defaultLanguage.id_lang+",#link_rewrite_"+defaultLanguage.id_lang)
+	$("#name_"+defaultLanguage+",#link_rewrite_"+defaultLanguage)
 		.live("handleSaveButtons", function(e)
 		{
 			handleSaveButtons()