diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Field/FieldType/TaxonomyTermReferenceFieldItemList.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Field/FieldType/TaxonomyTermReferenceFieldItemList.php index 096a45205ab..137a7e4e69e 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Field/FieldType/TaxonomyTermReferenceFieldItemList.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Field/FieldType/TaxonomyTermReferenceFieldItemList.php @@ -27,9 +27,12 @@ class TaxonomyTermReferenceFieldItemList extends LegacyConfigFieldItemList { $uuids[$delta] = $properties['target_uuid']; } if ($uuids) { + $entity_ids = \Drupal::entityQuery('taxonomy_term') + ->condition('uuid', $uuids, 'IN') + ->execute(); $entities = \Drupal::entityManager() ->getStorageController('taxonomy_term') - ->loadByProperties(array('uuid' => $uuids)); + ->loadMultiple($entity_ids); foreach ($entities as $id => $entity) { $entity_ids[$entity->uuid()] = $id;