[-] FO : Customized meesage with carriage return follow up #962

PrestaShop · Nov 12, 2013 · c196902 · c196902
1 parent cd83ec9
commit c196902
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/classes/Cart.php b/classes/Cart.php
@@ -1087,9 +1087,10 @@ public function _addCustomization($id_product, $id_product_attribute, $index, $t
 			);
 			$id_customization = Db::getInstance()->Insert_ID();
 		}
-
+
+		$field = preg_replace("/\<br\s*\/?\>/i", "\n", $field);
 		$query = 'INSERT INTO `'._DB_PREFIX_.'customized_data` (`id_customization`, `type`, `index`, `value`)
-			VALUES ('.(int)$id_customization.', '.(int)$type.', '.(int)$index.', \''.pSql($field).'\')';
+			VALUES ('.(int)$id_customization.', '.(int)$type.', '.(int)$index.', \''.pSQL($field).'\')';
 
 		if (!Db::getInstance()->execute($query))
 			return false;

diff --git a/modules/blockcart/blockcart-json.tpl b/modules/blockcart/blockcart-json.tpl
@@ -61,8 +61,8 @@
 					{foreach from=$datas key='index' item='data' name='datas'}
 						{ldelim}
 						"index":			{$index},
-						"value":			"{$data.value|addslashes|replace: '\\\'':'\''}",
-						"truncatedValue":	"{$data.value|truncate:28:'...'|addslashes|replace: '\\\'':'\''}"
+						"value":			"{Tools::nl2br($data.value|addslashes|replace: '\\\'':'\'')}",
+						"truncatedValue":	"{Tools::nl2br($data.value|truncate:28:'...'|addslashes|replace: '\\\'':'\'')}"
 						{rdelim}{if !$smarty.foreach.datas.last},{/if}
 					{/foreach}]
 				{rdelim}{if !$smarty.foreach.customization.last},{/if}