From 57dd992c28d70f1899fc577fa0133da846acba9d Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Wed, 26 Jun 2013 16:22:57 +0200
Subject: [PATCH] [-] FO : fixed entities issue in javascript alerts
 #PSCFV-9001

---
 .../template/controllers/groups/helpers/form/form.tpl     | 6 +++---
 js/hookLiveEdit.js                                        | 2 +-
 modules/blockcart/ajax-cart.js                            | 6 +++---
 themes/default/js/cart-summary.js                         | 4 ++--
 themes/default/js/order-address.js                        | 2 +-
 themes/default/js/order-opc.js                            | 8 ++++----
 themes/default/mobile/js/opc.js                           | 4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
index 681758327..7d2423cf1 100644
--- a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
@@ -130,10 +130,10 @@
 					if (jsonData.hasError)
 					{
 						var errors = '';
-						for(error in jsonData.errors)
+						for (error in jsonData.errors)
 							//IE6 bug fix
-							if(error != 'indexOf')
-								errors += jsonData.errors[error] + "\n";
+							if (error != 'indexOf')
+								errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
 						jAlert(errors);
 					}
 					else
diff --git a/js/hookLiveEdit.js b/js/hookLiveEdit.js
index b7b7b1239..1cd67129e 100644
--- a/js/hookLiveEdit.js
+++ b/js/hookLiveEdit.js
@@ -161,7 +161,7 @@ function getHookableList() {
 	        	var errors = '';
 				for (error in jsonData.errors) //IE6 bug fix
 				if (error != 'indexOf')
-					errors += jsonData.errors[error] + "\n";
+					errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
 				alert(errors);
         }
         else
diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js
index df74b0c63..a974bdbe4 100644
--- a/modules/blockcart/ajax-cart.js
+++ b/modules/blockcart/ajax-cart.js
@@ -568,10 +568,10 @@ var ajaxCart = {
 		if (jsonData.hasError)
 		{
 			var errors = '';
-			for(error in jsonData.errors)
+			for (error in jsonData.errors)
 				//IE6 bug fix
-				if(error != 'indexOf')
-					errors += jsonData.errors[error] + "\n";
+				if (error != 'indexOf')
+					errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
 			alert(errors);
 		}
 		else
diff --git a/themes/default/js/cart-summary.js b/themes/default/js/cart-summary.js
index 31c5c7df2..8c43483c9 100644
--- a/themes/default/js/cart-summary.js
+++ b/themes/default/js/cart-summary.js
@@ -454,7 +454,7 @@ function upQuantity(id, qty)
 				for(var error in jsonData.errors)
 					//IE6 bug fix
 					if(error !== 'indexOf')
-						errors += jsonData.errors[error] + "\n";
+						errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
 				alert(errors);
 				$('input[name=quantity_'+ id +']').val($('input[name=quantity_'+ id +'_hidden]').val());
 			}
@@ -539,7 +539,7 @@ function downQuantity(id, qty)
 					for(var error in jsonData.errors)
 						//IE6 bug fix
 						if(error !== 'indexOf')
-							errors += jsonData.errors[error] + "\n";
+							errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
 					alert(errors);
 					$('input[name=quantity_'+ id +']').val($('input[name=quantity_'+ id +'_hidden]').val());
 				}
diff --git a/themes/default/js/order-address.js b/themes/default/js/order-address.js
index 567bd85e0..a9c29a6eb 100644
--- a/themes/default/js/order-address.js
+++ b/themes/default/js/order-address.js
@@ -121,7 +121,7 @@ function updateAddresses()
 					for(var error in jsonData.errors)
 						//IE6 bug fix
 						if(error !== 'indexOf')
-							errors += jsonData.errors[error] + "\n";
+							errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
 					alert(errors);
 				}
 			},
diff --git a/themes/default/js/order-opc.js b/themes/default/js/order-opc.js
index 88c1d2af3..de6686d66 100644
--- a/themes/default/js/order-opc.js
+++ b/themes/default/js/order-opc.js
@@ -93,7 +93,7 @@ function updateAddressSelection()
 				for(var error in jsonData.errors)
 					//IE6 bug fix
 					if(error !== 'indexOf')
-						errors += jsonData.errors[error] + "\n";
+						errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
 				alert(errors);
 			}
 			else
@@ -186,7 +186,7 @@ function getCarrierListAndUpdate()
 				for(var error in jsonData.errors)
 					//IE6 bug fix
 					if(error !== 'indexOf')
-						errors += jsonData.errors[error] + "\n";
+						errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
 				alert(errors);
 			}
 			else
@@ -236,7 +236,7 @@ function updateCarrierSelectionAndGift()
 				for(var error in jsonData.errors)
 					//IE6 bug fix
 					if(error !== 'indexOf')
-						errors += jsonData.errors[error] + "\n";
+						errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
 				alert(errors);
 			}
 			else
@@ -703,7 +703,7 @@ function bindInputs()
 					for(var error in jsonData.errors)
 						//IE6 bug fix
 						if(error !== 'indexOf')
-							errors += jsonData.errors[error] + "\n";
+							errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
 					alert(errors);
 				}
 			else
diff --git a/themes/default/mobile/js/opc.js b/themes/default/mobile/js/opc.js
index 4f2c93825..9e550ed98 100644
--- a/themes/default/mobile/js/opc.js
+++ b/themes/default/mobile/js/opc.js
@@ -170,7 +170,7 @@ function bindInputs()
 					for(var error in jsonData.errors)
 						//IE6 bug fix
 						if(error !== 'indexOf')
-							errors += jsonData.errors[error] + "\n";
+							errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
 					alert(errors);
 				}
 			else
@@ -254,7 +254,7 @@ function updateCarrierSelectionAndGift()
 				for(var error in jsonData.errors)
 					//IE6 bug fix
 					if(error !== 'indexOf')
-						errors += jsonData.errors[error] + "\n";
+						errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
 				alert(errors);
 			}
 			else