diff --git a/core/modules/content_moderation/src/ModeratedNodeListBuilder.php b/core/modules/content_moderation/src/ModeratedNodeListBuilder.php index 84d6c22..30b90f9 100644 --- a/core/modules/content_moderation/src/ModeratedNodeListBuilder.php +++ b/core/modules/content_moderation/src/ModeratedNodeListBuilder.php @@ -17,6 +17,13 @@ class ModeratedNodeListBuilder extends NodeListBuilder { /** + * The entity storage class. + * + * @var \Drupal\Core\Entity\RevisionableStorageInterface + */ + protected $storage; + + /** * The entity type manager. * * @var \Drupal\Core\Entity\EntityTypeManagerInterface @@ -60,11 +67,8 @@ public static function createInstance(ContainerInterface $container, EntityTypeI * {@inheritdoc} */ public function load() { - $entities = []; - foreach ($this->getEntityRevisionIds() as $entity_id => $revision_id) { - $entities[$entity_id] = $this->storage->loadRevision($revision_id); - } - return $entities; + $revision_ids = $this->getEntityRevisionIds(); + return $this->storage->loadMultipleRevisions($revision_ids); } /** @@ -88,7 +92,7 @@ protected function getEntityRevisionIds() { $result = $query->execute(); - return $result ? array_column($result, 'content_entity_revision_id', 'content_entity_id_max') : []; + return $result ? array_column($result, 'content_entity_revision_id') : []; } /**