Merge branch '12303' into 12400
This commit is contained in:
commit
0bf76c3778
@ -142,8 +142,8 @@ 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 );
|
||||||
$v = json_encode($this->data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | LOCK_EX);
|
$v = json_encode($this->data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE );
|
||||||
$l = strlen($v);
|
$l = strlen($v);
|
||||||
$t = 0;
|
$t = 0;
|
||||||
while ($t < 5) {
|
while ($t < 5) {
|
||||||
@ -159,6 +159,4 @@ class JsonDb extends \Prowebcraft\Dot
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
@ -1070,7 +1070,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>';
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user