admin/core
1
0
Fork 0
mirror of https://github.com/jbcr/core.git synced 2026-03-30 04:42:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't show old fields in a set if they're removed from the definition

Browse Source
This commit is contained in:
Ivo Valchev
2021-02-16 10:38:53 +01:00
committed by Bob den Otter
parent 101d4304bb
commit 2af998d504
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Entity/Field/SetField.php
View File

@@ -83,7 +83,10 @@ class SetField extends Field implements FieldInterface, FieldParentInterface, Li
{
$fieldsFromDefinition = $this->getFieldsFromDefinition();
return array_merge($fieldsFromDefinition, $this->getDefaultValue(), $this->getValue());
// Values from the database, but not of fields that are no longer in the definition.
$value = array_intersect_key($this->getValue(), $fieldsFromDefinition);
return array_merge($fieldsFromDefinition, $this->getDefaultValue(), $value);
}
private function getFieldsFromDefinition(): array