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

Upgrade to 3.4.1

Browse Source
This commit is contained in:
Bastian Allgeier
2020-08-04 15:56:15 +02:00
parent f2f3bb96c0
commit 68078dd107
33 changed files with 328 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kirby/src/Form/Field.php
View File

@@ -284,8 +284,9 @@ class Field extends Component
unset($array['model']);
$array['invalid'] = $this->isInvalid();
$array['errors'] = $this->errors();
$array['invalid'] = $this->isInvalid();
$array['saveable'] = $this->save();
$array['signature'] = md5(json_encode($array));
ksort($array);

13
kirby/src/Form/Form.php
View File

@@ -85,13 +85,22 @@ class Form
}
}
public function data($defaults = false): array
public function content(): array
{
return $this->data(false, false);
}
public function data($defaults = false, bool $includeNulls = true): array
{
$data = $this->values;
foreach ($this->fields as $field) {
if ($field->save() === false || $field->unset() === true) {
$data[$field->name()] = null;
if ($includeNulls === true) {
$data[$field->name()] = null;
} else {
unset($data[$field->name()]);
}
} else {
$data[$field->name()] = $field->data($defaults);
}