interkollektives/lichterei-web
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.9.3

Browse Source
This commit is contained in:
Bastian Allgeier
2023-03-30 15:17:37 +02:00
parent 20e971adb4
commit cd495f054e
47 changed files with 3386 additions and 2384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kirby/src/Form/Field/BlocksField.php
View File

@@ -202,6 +202,18 @@ class BlocksField extends FieldClass
return $this->valueToJson($blocks, $this->pretty());
}
protected function setDefault($default = null)
{
// set id for blocks if not exists
if (is_array($default) === true) {
array_walk($default, function (&$block) {
$block['id'] ??= Str::uuid();
});
}
parent::setDefault($default);
}
protected function setFieldsets($fieldsets, $model)
{
if (is_string($fieldsets) === true) {

26
kirby/src/Form/Field/LayoutField.php
View File

@@ -115,6 +115,32 @@ class LayoutField extends BlocksField
return $routes;
}
protected function setDefault($default = null)
{
// set id for layouts, columns and blocks within layout if not exists
if (is_array($default) === true) {
array_walk($default, function (&$layout) {
$layout['id'] ??= Str::uuid();
// set columns id within layout
if (isset($layout['columns']) === true) {
array_walk($layout['columns'], function (&$column) {
$column['id'] ??= Str::uuid();
// set blocks id within column
if (isset($column['blocks']) === true) {
array_walk($column['blocks'], function (&$block) {
$block['id'] ??= Str::uuid();
});
}
});
}
});
}
parent::setDefault($default);
}
protected function setLayouts(array $layouts = [])
{
$this->layouts = array_map(

6
kirby/src/Form/FieldClass.php
View File

@@ -838,11 +838,13 @@ abstract class FieldClass
*/
protected function valueToJson(array $value = null, bool $pretty = false): string
{
$constants = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
if ($pretty === true) {
return json_encode($value, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
$constants |= JSON_PRETTY_PRINT;
}
return json_encode($value);
return json_encode($value, $constants);
}
/**