From 33ade8c2299a2b170fc2792ab4ddff645fe04de1 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Thu, 6 Mar 2014 10:25:32 +0000 Subject: [PATCH] Issue #2143519 by followup yched, swentel: Allow FieldInstance yml files to refer to the Field by field name rather than by field_uuid. --- .../field/lib/Drupal/field/Entity/FieldInstanceConfig.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php b/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php index 6024061e680..e61896a28b4 100644 --- a/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php +++ b/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php @@ -240,8 +240,10 @@ class FieldInstanceConfig extends ConfigEntityBase implements FieldInstanceConfi */ public function __construct(array $values, $entity_type = 'field_instance_config') { // Field instances configuration is stored with a 'field_uuid' property - // unambiguously identifying the field. - if (isset($values['field_uuid'])) { + // unambiguously identifying the field. We only take it into account if a + // 'uuid' entry is present too, so that leftover 'field_uuid' entries + // present in config files imported as "default module config" are ignored. + if (isset($values['field_uuid']) && isset($values['uuid'])) { $field = field_info_field_by_id($values['field_uuid']); if (!$field) { throw new FieldException(format_string('Attempt to create an instance of unknown field @uuid', array('@uuid' => $values['field_uuid'])));