ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

Merge branch '12303-temp' into 12303-valid

This commit is contained in:
Fred Tempez 2023-03-20 19:10:32 +01:00
parent 6973442e4a f9c866dadb
commit 47c98e25e4
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/class/helper.class.php
View File

@ -539,6 +539,10 @@ class helper
$css = preg_replace(['(( )+{)', '({( )+)'], '{', $css); $css = preg_replace(['(( )+{)', '({( )+)'], '{', $css);
$css = preg_replace(['(( )+})', '(}( )+)', '(;( )*})'], '}', $css); $css = preg_replace(['(( )+})', '(}( )+)', '(;( )*})'], '}', $css);
$css = preg_replace(['(;( )+)', '(( )+;)'], ';', $css); $css = preg_replace(['(;( )+)', '(( )+;)'], ';', $css);
// Convertir les codes entités
$css = htmlspecialchars_decode($css);
// Supprime les balises HTML
$css = strip_tags($css);
// Retourne le css minifié // Retourne le css minifié
return $css; return $css;
} }

2
core/class/jsondb/JsonDb.class.php
View File

@ -142,7 +142,7 @@ class JsonDb extends \Prowebcraft\Dot
*/ */
public function save() public function save()
{ {
$v = json_encode($this->data, JSON_UNESCAPED_UNICODE | LOCK_EX); $v = json_encode($this->data, JSON_UNESCAPED_UNICODE);
$l = strlen($v); $l = strlen($v);
$t = 0; $t = 0;
while ($t < 5) { while ($t < 5) {

5
core/class/layout.class.php
View File

@ -1043,7 +1043,8 @@ class layout extends common
if ($this->core->output['inlineScript']) { if ($this->core->output['inlineScript']) {
$inlineScript = implode($this->core->output['inlineScript']); $inlineScript = implode($this->core->output['inlineScript']);
} }
echo '<script defer>' . helper::minifyJs($coreScript . $this->core->output['script'] . htmlspecialchars_decode($inlineScript)) . '</script>'; echo '<script defer>' . helper::minifyJs($coreScript . $this->core->output['script'] ) . '</script>';
echo '<script defer>' . htmlspecialchars_decode(helper::minifyJs($inlineScript)) . '</script>';
} }
/** /**
@ -1070,7 +1071,7 @@ class layout extends common
if ($this->core->output['inlineStyle']) { if ($this->core->output['inlineStyle']) {
foreach ($this->core->output['inlineStyle'] as $style) { foreach ($this->core->output['inlineStyle'] as $style) {
if ($style) { if ($style) {
echo '<style type="text/css">' . helper::minifyCss($style) . '</style>'; echo '<style type="text/css">' . helper::minifyCss(htmlspecialchars_decode($style)) . '</style>';
} }
} }