dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gRoussac
2013-11-12 10:41:19 +01:00
parent cd83ec93c7
commit c1969028f2
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+2 -1
View File
@@ -1088,8 +1088,9 @@ class CartCore extends ObjectModel
$id_customization = Db::getInstance()->Insert_ID(); $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`) $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)) if (!Db::getInstance()->execute($query))
return false; return false;
modules/blockcart/blockcart-json.tpl
+2 -2
View File
@@ -61,8 +61,8 @@
{foreach from=$datas key='index' item='data' name='datas'} {foreach from=$datas key='index' item='data' name='datas'}
{ldelim} {ldelim}
"index": {$index}, "index": {$index},
"value": "{$data.value|addslashes|replace: '\\\'':'\''}", "value": "{Tools::nl2br($data.value|addslashes|replace: '\\\'':'\'')}",
"truncatedValue": "{$data.value|truncate:28:'...'|addslashes|replace: '\\\'':'\''}" "truncatedValue": "{Tools::nl2br($data.value|truncate:28:'...'|addslashes|replace: '\\\'':'\'')}"
{rdelim}{if !$smarty.foreach.datas.last},{/if} {rdelim}{if !$smarty.foreach.datas.last},{/if}
{/foreach}] {/foreach}]
{rdelim}{if !$smarty.foreach.customization.last},{/if} {rdelim}{if !$smarty.foreach.customization.last},{/if}