// MERGE product_multistore branch : product fields are now editable per shop

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 13:32:12 +00:00
parent d4d1c35cb9
commit 0c2dd0cd2f
134 changed files with 3185 additions and 1789 deletions
@@ -73,6 +73,7 @@ class TranslateCore
 			$str = Translate::getGenericAdminTranslation($string, $key, $_LANGADM);

 		$str = $htmlentities ? htmlentities($str, ENT_QUOTES, 'utf-8') : $str;
+		$str = str_replace('"', '&quot;', $str);

 		if ($sprintf)
 		{
@@ -82,7 +83,7 @@ class TranslateCore
 			$str = vsprintf($str, $sprintf);
 		}

-		return str_replace('"', '&quot;', ($addslashes ? addslashes($str) : stripslashes($str)));
+		return ($addslashes ? addslashes($str) : stripslashes($str));
 	}

 	/**