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

[-] MO : fix bug #PSFV-649 - Escapes in Smarty l (L) function are not escaped in output

Browse Source
This commit is contained in:
tDidierjean
2012-03-15 14:29:08 +00:00
parent 74a94a2255
commit c538bcd57a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Translate.php
+4 -4
View File
@@ -141,7 +141,7 @@ class TranslateCore
$translations_merged[md5($file)] = true; $translations_merged[md5($file)] = true;
} }
$string = str_replace('\'', '\\\'', $string); $key = md5(str_replace('\'', '\\\'', $string));
$cache_key = $name.'|'.$string.'|'.$source; $cache_key = $name.'|'.$string.'|'.$source;
if (!isset($lang_cache[$cache_key])) if (!isset($lang_cache[$cache_key]))
@@ -151,8 +151,8 @@ class TranslateCore
// set array key to lowercase for 1.3 compatibility // set array key to lowercase for 1.3 compatibility
$_MODULES = array_change_key_case($_MODULES); $_MODULES = array_change_key_case($_MODULES);
$currentKey = '<{'.strtolower($name).'}'.strtolower(_THEME_NAME_).'>'.strtolower($source).'_'.md5($string); $currentKey = '<{'.strtolower($name).'}'.strtolower(_THEME_NAME_).'>'.strtolower($source).'_'.$key;
$defaultKey = '<{'.strtolower($name).'}prestashop>'.strtolower($source).'_'.md5($string); $defaultKey = '<{'.strtolower($name).'}prestashop>'.strtolower($source).'_'.$key;
if (isset($_MODULES[$currentKey])) if (isset($_MODULES[$currentKey]))
$ret = stripslashes($_MODULES[$currentKey]); $ret = stripslashes($_MODULES[$currentKey]);
@@ -164,7 +164,7 @@ class TranslateCore
$ret = stripslashes($_MODULES[Tools::strtolower($defaultKey)]); $ret = stripslashes($_MODULES[Tools::strtolower($defaultKey)]);
// if translation was not found in module, look for it in AdminController or Helpers // if translation was not found in module, look for it in AdminController or Helpers
elseif (!empty($_LANGADM)) elseif (!empty($_LANGADM))
$ret = Translate::getGenericAdminTranslation($string, null, $_LANGADM); $ret = Translate::getGenericAdminTranslation($string, $key, $_LANGADM);
else else
$ret = stripslashes($string); $ret = stripslashes($string);