diff --git a/core/lib/Drupal/Core/Field/DeletedFieldsRepository.php b/core/lib/Drupal/Core/Field/DeletedFieldsRepository.php index b3db9e3..886fd97 100644 --- a/core/lib/Drupal/Core/Field/DeletedFieldsRepository.php +++ b/core/lib/Drupal/Core/Field/DeletedFieldsRepository.php @@ -40,7 +40,7 @@ public function getFieldDefinitions($field_storage_unique_id = NULL) { if ($field_definition instanceof FieldConfigBase && isset($deleted_storage_definitions[$field_definition->field_storage_unique_id])) { $config = $field_definition->toArray(); $config['deleted'] = TRUE; - $config['fieldStorage'] = $deleted_storage_definitions[$field_definition->field_storage_unique_id]; + $config['field_storage'] = $deleted_storage_definitions[$field_definition->field_storage_unique_id]; $updated_field_definition = get_class($field_definition)::create($config); // Re-assign the 'field_storage_unique_id' property since it was lost diff --git a/core/modules/field/src/Entity/FieldConfig.php b/core/modules/field/src/Entity/FieldConfig.php index d8b4332..1a23bcb 100644 --- a/core/modules/field/src/Entity/FieldConfig.php +++ b/core/modules/field/src/Entity/FieldConfig.php @@ -204,7 +204,6 @@ public static function preDelete(EntityStorageInterface $storage, array $fields) $target_entity_storage = $entity_type_manager->getStorage($field->getTargetEntityTypeId()); if (!$field->deleted && $target_entity_storage instanceof FieldableEntityStorageInterface && $target_entity_storage->countFieldData($field->getFieldStorageDefinition(), TRUE)) { $field = clone $field; - $field->deleted = TRUE; $deleted_fields_repository->addFieldDefinition($field); } }