From 7244ec1389faf7c96c8b90bf19d27352e0a9811d Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Thu, 20 Jun 2013 10:44:24 +0200
Subject: [PATCH] [-] FO : Fix bug #PSCFV-9525 escape double quote in address
 formated fields

---
 themes/default/order-address.tpl | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/themes/default/order-address.tpl b/themes/default/order-address.tpl
index 2043b00ec..47097680f 100644
--- a/themes/default/order-address.tpl
+++ b/themes/default/order-address.tpl
@@ -85,12 +85,12 @@
 		{ldelim}
 			'ordered_fields':[
 				{foreach from=$type.ordered_fields key=num_field item=field_name name=inv_loop}
-					{if !$smarty.foreach.inv_loop.first},{/if}"{$field_name}"
+					{if !$smarty.foreach.inv_loop.first},{/if}{$field_name|json_encode}
 				{/foreach}
 			],
 			'formated_fields_values':{ldelim}
 					{foreach from=$type.formated_fields_values key=pattern_name item=field_name name=inv_loop}
-						{if !$smarty.foreach.inv_loop.first},{/if}"{$pattern_name}":"{$field_name}"
+						{if !$smarty.foreach.inv_loop.first},{/if}{$pattern_name|json_encode}:{$field_name|json_encode}
 					{/foreach}
 				{rdelim}
 		{rdelim}
@@ -99,10 +99,9 @@
 	function getAddressesTitles()
 	{
 		return {
-						'invoice': "{l s='Your billing address' js=1}",
-						'delivery': "{l s='Your delivery address' js=1}"
-			};
-
+			'invoice': "{l s='Your billing address' js=1}",
+			'delivery': "{l s='Your delivery address' js=1}"
+		};
 	}