From 50d230fb035987256cb98dfbdf540e2a1bc762e5 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Thu, 15 Mar 2012 14:29:08 +0000
Subject: [PATCH] [-] MO : fix bug #PSFV-649 - Escapes in Smarty l (L) function
 are not escaped in output

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14198 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/Translate.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/Translate.php b/classes/Translate.php
index 94f766e6f..c3927ca2c 100644
--- a/classes/Translate.php
+++ b/classes/Translate.php
@@ -141,7 +141,7 @@ class TranslateCore
 			$translations_merged[md5($file)] = true;
 		}
 
-		$string = str_replace('\'', '\\\'', $string);
+		$key = md5(str_replace('\'', '\\\'', $string));
 
 		$cache_key = $name.'|'.$string.'|'.$source;
 		if (!isset($lang_cache[$cache_key]))
@@ -151,8 +151,8 @@ class TranslateCore
 
 			// set array key to lowercase for 1.3 compatibility
 			$_MODULES = array_change_key_case($_MODULES);
-			$currentKey = '<{'.strtolower($name).'}'.strtolower(_THEME_NAME_).'>'.strtolower($source).'_'.md5($string);
-			$defaultKey = '<{'.strtolower($name).'}prestashop>'.strtolower($source).'_'.md5($string);
+			$currentKey = '<{'.strtolower($name).'}'.strtolower(_THEME_NAME_).'>'.strtolower($source).'_'.$key;
+			$defaultKey = '<{'.strtolower($name).'}prestashop>'.strtolower($source).'_'.$key;
 
 			if (isset($_MODULES[$currentKey]))
 				$ret = stripslashes($_MODULES[$currentKey]);
@@ -164,7 +164,7 @@ class TranslateCore
 				$ret = stripslashes($_MODULES[Tools::strtolower($defaultKey)]);
 			// if translation was not found in module, look for it in AdminController or Helpers
 			elseif (!empty($_LANGADM))
-				$ret = Translate::getGenericAdminTranslation($string, null, $_LANGADM);
+				$ret = Translate::getGenericAdminTranslation($string, $key, $_LANGADM);
 			else
 				$ret = stripslashes($string);