Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / lib / Drupal / Core / Entity / Plugin / DataType / EntityAdapter.php

diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php b/web/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php
index db194b5485262e06b78670c6e112cb8843ffc8e2..b0b94b8dbb938c1c15853da6aa38bd8278d20a28 100644 (file)
--- a/web/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php
@@ -167,7 +167,7 @@ class EntityAdapter extends TypedData implements \IteratorAggregate, ComplexData
    * {@inheritdoc}
    */
   public function getIterator() {
-    return isset($this->entity) ? $this->entity->getIterator() : new \ArrayIterator([]);
+    return $this->entity instanceof \IteratorAggregate ? $this->entity->getIterator() : new \ArrayIterator([]);
   }
 
 }