From 19c6c403d76e86e11e450a748d14a37f769c4cae Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Mon, 20 Mar 2023 11:41:20 +0100
Subject: [PATCH] =?UTF-8?q?JS=20entit=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/class/helper.class.php | 2 --
 core/class/layout.class.php | 5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/class/helper.class.php b/core/class/helper.class.php
index 39c71e87..eee6825a 100644
--- a/core/class/helper.class.php
+++ b/core/class/helper.class.php
@@ -562,8 +562,6 @@ class helper
 		// Supprime les tabulations, espaces, nouvelles lignes, etc...
 		$js = str_replace(["\r\n", "\r", "\t", "\n", '  ', '    ', '     '], '', $js);
 		$js = preg_replace(['(( )+\))', '(\)( )+)'], ')', $js);
-		// Convertir les codes entités
-		$js = htmlspecialchars_decode($js);
 		// Retourne le js minifié
 		return $js;
 	}
diff --git a/core/class/layout.class.php b/core/class/layout.class.php
index 2560d31a..c9adbb95 100644
--- a/core/class/layout.class.php
+++ b/core/class/layout.class.php
@@ -1043,8 +1043,9 @@ class layout extends common
         if ($this->core->output['inlineScript']) {
             $inlineScript = implode($this->core->output['inlineScript']);
         }
-        echo '<script defer>' . helper::minifyJs( $coreScript) . '</script>';
-        echo '<script defer>' . helper::minifyJs( $inlineScript) . '</script>';
+        echo '<script defer>' . helper::minifyJs($coreScript . $this->core->output['script'] . htmlspecialchars_decode($inlineScript)) . '</script>';
+
+        
     }
 
     /**