core/modules/editor/editor.module                  |  10 +-
 .../editor/src/Tests/EditorFileUsageTest.php       | 128 +++++++++++++++------
 2 files changed, 99 insertions(+), 39 deletions(-)

diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index e83d49a..b85fa85 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -464,7 +464,15 @@ function _editor_get_file_uuids_by_field(EntityInterface $entity) {
 
   $formatted_text_fields = _editor_get_formatted_text_fields($entity);
   foreach ($formatted_text_fields as $formatted_text_field) {
-    $text = $entity->get($formatted_text_field)->value;
+    $text = '';
+    $field_items = $entity->get($formatted_text_field);
+    debug(count($field_items));
+    if (count($field_items) === 1) {
+      debug(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 10));
+    }
+    foreach ($field_items as $field_item) {
+      $text .= $field_item->value;
+    }
     $uuids[$formatted_text_field] = _editor_parse_file_uuids($text);
   }
   return $uuids;
diff --git a/core/modules/editor/src/Tests/EditorFileUsageTest.php b/core/modules/editor/src/Tests/EditorFileUsageTest.php
index 7b5210e..4981433 100644
--- a/core/modules/editor/src/Tests/EditorFileUsageTest.php
+++ b/core/modules/editor/src/Tests/EditorFileUsageTest.php
@@ -56,33 +56,57 @@ protected function setUp() {
    * Tests the configurable text editor manager.
    */
   public function testEditorEntityHooks() {
-    $image = entity_create('file');
-    $image->setFileUri('core/misc/druplicon.png');
-    $image->setFilename(drupal_basename($image->getFileUri()));
-    $image->save();
-    $file_usage = $this->container->get('file.usage');
-    $this->assertIdentical(array(), $file_usage->listUsage($image), 'The image has zero usages.');
-
-    $body_value = '<p>Hello, world!</p><img src="awesome-llama.jpg" data-entity-type="file" data-entity-uuid="' . $image->uuid() . '" />';
-    // Test handling of an invalid data-entity-uuid attribute.
-    $body_value .= '<img src="awesome-llama.jpg" data-entity-type="file" data-entity-uuid="invalid-entity-uuid-value" />';
-    // Test handling of an invalid data-entity-type attribute.
-    $body_value .= '<img src="awesome-llama.jpg" data-entity-type="invalid-entity-type-value" data-entity-uuid="' . $image->uuid() . '" />';
-    // Test handling of a non-existing UUID.
-    $body_value .= '<img src="awesome-llama.jpg" data-entity-type="file" data-entity-uuid="30aac704-ba2c-40fc-b609-9ed121aa90f4" />';
+    $image_paths = array(
+      0 => 'core/misc/druplicon.png',
+      1 => 'core/misc/tree.png',
+      2 => 'core/misc/help.png',
+    );
+
+    $image_entities = array();
+    foreach ($image_paths as $image_path) {
+      $image = entity_create('file');
+      $image->setFileUri($image_path);
+      $image->setFilename(drupal_basename($image->getFileUri()));
+      $image->save();
+
+      $file_usage = $this->container->get('file.usage');
+      $this->assertIdentical(array(), $file_usage->listUsage($image), 'The image has zero usages.');
+
+      // Store the image entity in an array for later use
+      $image_entities[] = $image;
+    }
+
+    $body = array();
+    foreach ($image_entities as $key => $image_entity) {
+      // Don't be rude, say hello
+      $body_value = '<p>Hello, world!</p>';
+      // Test handling of a valid image entry
+      $body_value .= '<img src="awesome-llama-' . $key . '.jpg" data-entity-type="file" data-entity-uuid="' . $image_entity->uuid() . '" />';
+      // Test handling of an invalid data-entity-uuid attribute.
+      $body_value .= '<img src="awesome-llama-' . $key . '.jpg" data-entity-type="file" data-entity-uuid="invalid-entity-uuid-value" />';
+      // Test handling of an invalid data-entity-type attribute.
+      $body_value .= '<img src="awesome-llama-' . $key . '.jpg" data-entity-type="invalid-entity-type-value" data-entity-uuid="' . $image_entity->uuid() . '" />';
+      // Test handling of a non-existing UUID.
+      $body_value .= '<img src="awesome-llama-' . $key . '.jpg" data-entity-type="file" data-entity-uuid="30aac704-ba2c-40fc-b609-9ed121aa90f4" />';
+
+      $body[] = array(
+        'value' => $body_value,
+        'format' => 'filtered_html',
+      );
+    }
+    
     // Test editor_entity_insert(): increment.
     $this->createUser();
     $node = entity_create('node', array(
       'type' => 'page',
       'title' => 'test',
-      'body' => array(
-        'value' => $body_value,
-        'format' => 'filtered_html',
-      ),
+      'body' => $body,
       'uid' => 1,
     ));
     $node->save();
-    $this->assertIdentical(array('editor' => array('node' => array(1 => '1'))), $file_usage->listUsage($image), 'The image has 1 usage.');
+    foreach ($image_entities as $image_entity) {
+      $this->assertIdentical(array('editor' => array('node' => array(1 => '1'))), $file_usage->listUsage($image_entity), 'The image has 1 usage.');
+    }
 
     // Test editor_entity_update(): increment, twice, by creating new revisions.
     $node->setNewRevision(TRUE);
@@ -90,45 +114,73 @@ public function testEditorEntityHooks() {
     $second_revision_id = $node->getRevisionId();
     $node->setNewRevision(TRUE);
     $node->save();
-    $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image), 'The image has 3 usages.');
+    foreach ($image_entities as $image_entity) {
+      $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image_entity), 'The image has 3 usages.');
+    }
 
     // Test hook_entity_update(): decrement, by modifying the last revision:
     // remove the data-entity-type attribute from the body field.
-    $body = $node->get('body')->first()->get('value');
-    $original_value = $body->getValue();
-    $new_value = str_replace('data-entity-type', 'data-entity-type-modified', $original_value);
-    $body->setValue($new_value);
+    $original_values = array();
+    for ($i=0; $i < sizeof($image_entities); $i++) { 
+      $body = $node->get('body')->get($i)->get('value');
+      $original_value = $body->getValue();
+      $new_value = str_replace('data-entity-type', 'data-entity-type-YOLO', $original_value);
+      $body->setValue($new_value);
+      $original_values[$i] = $original_value;
+    }
+
     $node->save();
-    $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image), 'The image has 2 usages.');
+    foreach ($image_entities as $image_entity) {
+      $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image_entity), 'The image has 2 usages.');
+    }
+    return;
 
     // Test editor_entity_update(): increment again by creating a new revision:
     // read the data- attributes to the body field.
     $node->setNewRevision(TRUE);
-    $node->get('body')->first()->get('value')->setValue($original_value);
+    foreach ($original_values as $key => $original_value) {
+      $node->get('body')->get($key)->get('value')->setValue($original_value);
+    }
+
     $node->save();
-    $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image), 'The image has 3 usages.');
+    foreach ($image_entities as $image_entity) {
+      $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image_entity), 'The image has 3 usages.');
+    }
 
     // Test hook_entity_update(): decrement, by modifying the last revision:
     // remove the data-entity-uuid attribute from the body field.
-    $body = $node->get('body')->first()->get('value');
-    $new_value = str_replace('data-entity-uuid', 'data-entity-uuid-modified', $original_value);
-    $body->setValue($new_value);
+    foreach ($original_values as $key => $original_value) {
+      $body = $node->get('body')->get($key)->get('value');
+      $new_value = str_replace('data-entity-uuid', 'data-entity-uuid-modified', $original_value);
+      $body->setValue($new_value);
+    }
+    
     $node->save();
-    $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image), 'The image has 2 usages.');
-
-    // Test hook_entity_update(): increment, by modifying the last revision:
-    // read the data- attributes to the body field.
-    $node->get('body')->first()->get('value')->setValue($original_value);
+    foreach ($image_entities as $image_entity) {
+      $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image_entity), 'The image has 2 usages.');
+    }
+
+    // // Test hook_entity_update(): increment, by modifying the last revision:
+    // // read the data- attributes to the body field.
+    foreach ($original_values as $key => $original_value) {
+      $node->get('body')->get($key)->get('value')->setValue($original_value);
+    }
     $node->save();
-    $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image), 'The image has 3 usages.');
+    foreach ($image_entities as $image_entity) {
+      $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image_entity), 'The image has 3 usages.');
+    }
 
     // Test editor_entity_revision_delete(): decrement, by deleting a revision.
     entity_revision_delete('node', $second_revision_id);
-    $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image), 'The image has 2 usages.');
+    foreach ($image_entities as $image_entity) {
+      $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image_entity), 'The image has 2 usages.');
+    }
 
     // Test editor_entity_delete().
     $node->delete();
-    $this->assertIdentical(array(), $file_usage->listUsage($image), 'The image has zero usages again.');
+    foreach ($image_entities as $image_entity) {
+      $this->assertIdentical(array(), $file_usage->listUsage($image_entity), 'The image has zero usages again.');
+    }
   }
 
 }