// Merge -> revision 8800

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8808 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 14:30:06 +00:00
parent 05fde82c53
commit 1b6d0d1be3
110 changed files with 1240 additions and 1066 deletions
@@ -509,8 +509,8 @@ class ToolsCore
 	public static function safeOutput($string, $html = false)
 	{
 	 	if (!$html)
-			$string = @htmlentities(strip_tags($string), ENT_QUOTES, 'utf-8');
-		return $string;
+			$string = strip_tags($string);
+		return @Tools::htmlentitiesUTF8($string, ENT_QUOTES);;
 	}

 	public static function htmlentitiesUTF8($string, $type = ENT_QUOTES)