diff --git a/core/includes/config.inc b/core/includes/config.inc index d0f1d7b..f988628 100644 --- a/core/includes/config.inc +++ b/core/includes/config.inc @@ -81,8 +81,15 @@ function ($value) use ($name) { $new_config->setData($data); } if ($entity_type = config_get_entity_type_by_name($name)) { - $entity_manager - ->getStorageController($entity_type) + $entity_storage = $entity_manager->getStorageController($entity_type); + // The exported default configuration could contain a UUID from the + // originally originating site. Ensure that a new UUID is created for + // every newly created configuration entity, so that it is universally + // unique. + $entity_info = $entity_storage->entityInfo(); + $new_config->set($entity_info['entity_keys']['uuid'], NULL); + + $entity_storage ->create($new_config->get()) ->save(); }