mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-11 17:24:46 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#1792

Browse Source
This commit is contained in:
Ryan Cramer
2023-07-27 09:57:15 -04:00
parent 308ca91daf
commit a2d5d62131
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wire/core/Field.php
View File

@@ -525,7 +525,14 @@ class Field extends WireData implements Saveable, Exportable {
if($this->type) { if($this->type) {
$typeData = $this->type->exportConfigData($this, $data); $typeData = $this->type->exportConfigData($this, $data);
$data = array_merge($typeData, $data); // argument order reversed per #1638 foreach($typeData as $key => $value) {
if($value === null && isset($data[$key])) {
// prevent null from overwriting non-null, alternative for #1638
unset($typeData[$key]);
}
}
// $data = array_merge($typeData, $data); // argument order reversed per #1638...
$data = array_merge($data, $typeData); // ...and later un-reversed per #1792
} }
// remove named flags from data since the 'flags' property already covers them // remove named flags from data since the 'flags' property already covers them
@@ -1608,4 +1615,3 @@ class Field extends WireData implements Saveable, Exportable {
} }
} }