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

[-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution

Browse Source
This commit is contained in:
Rémi Gaillard
2012-12-07 17:23:06 +01:00
parent 6dd0a04ed0
commit cd7cc208e8
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/smartyfront.config.inc.php
+3 -3
View File
@@ -30,7 +30,7 @@ function smartyTranslate($params, &$smarty)
{
global $_LANG;
if (!isset($params['js'])) $params['js'] = 0;
if (!isset($params['js'])) $params['js'] = false;
if (!isset($params['pdf'])) $params['pdf'] = false;
if (!isset($params['mod'])) $params['mod'] = false;
if (!isset($params['sprintf'])) $params['sprintf'] = null;
@@ -45,7 +45,7 @@ function smartyTranslate($params, &$smarty)
$key = 'override_'.$key;
if ($params['mod'])
return Translate::getModuleTranslation($params['mod'], $params['s'], $basename, $params['sprintf']);
return Translate::getModuleTranslation($params['mod'], $params['s'], $basename, $params['sprintf'], $params['js']);
else if ($params['pdf'])
return Translate::getPdfTranslation($params['s']);
@@ -62,6 +62,6 @@ function smartyTranslate($params, &$smarty)
if ($params['sprintf'] !== null)
$msg = Translate::checkAndReplaceArgs($msg, $params['sprintf']);
return $params['js'] ? $msg : Tools::htmlentitiesUTF8($msg);
return $params['js'] ? $msg : addslashes($msg);
}