From 557571b23b39e4f087cbddaa7afd5417ae11422a Mon Sep 17 00:00:00 2001
From: Stefan Giehl <stefan@piwik.org>
Date: Wed, 4 Oct 2017 22:27:31 +0200
Subject: force using utf-8 as charset for htmlentities/htmlspecialchars
 (#12135)

---
 core/Twig.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/Twig.php')

diff --git a/core/Twig.php b/core/Twig.php
index 827c0c411f..c36452055b 100755
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -373,7 +373,7 @@ class Twig
     {
         $rawSafeDecoded = new Twig_SimpleFilter('rawSafeDecoded', function ($string) {
             $string = str_replace('+', '%2B', $string);
-            $string = str_replace('&nbsp;', html_entity_decode('&nbsp;'), $string);
+            $string = str_replace('&nbsp;', html_entity_decode('&nbsp;', ENT_COMPAT | ENT_HTML401, 'UTF-8'), $string);
 
             $string = SafeDecodeLabel::decodeLabelSafe($string);
 
-- 
cgit v1.2.3