ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team/ZwiiCMS
10
9
Fork 3
Code Releases 153 Activity

Merge branch '12303' into 12400

Browse Source
This commit is contained in:
Fred Tempez 2023-03-20 10:10:46 +01:00
commit 0bf76c3778
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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