Issue #1974474 by Berdir: Make sure within field_attach_()*() that we are working with a BC entity.

core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php

@@ -160,19 +160,12 @@ protected function attachLoad(&$queried_entities, $load_revision = FALSE) {
     // Map the loaded stdclass records into entity objects and according fields.
     $queried_entities = $this->mapFromStorageRecords($queried_entities, $load_revision);
 
-    // Activate backward-compatibility mode to attach fields.
     if ($this->entityInfo['fieldable']) {
-      // Prepare BC compatible entities before passing them to the field API.
-      $bc_entities = array();
-      foreach ($queried_entities as $key => $entity) {
-        $bc_entities[$key] = $entity->getBCEntity();
-      }
-
       if ($load_revision) {
-        field_attach_load_revision($this->entityType, $bc_entities);
+        field_attach_load_revision($this->entityType, $queried_entities);
       }
       else {
-        field_attach_load($this->entityType, $bc_entities);
+        field_attach_load($this->entityType, $queried_entities);
       }
     }
 
@@ -423,7 +416,7 @@ protected function invokeHook($hook, EntityInterface $entity) {
       $function = 'field_attach_delete_revision';
     }
     if (!empty($this->entityInfo['fieldable']) && function_exists($function)) {
-      $function($entity->getBCEntity());
+      $function($entity);
     }
 
     // Invoke the hook.

core/lib/Drupal/Core/Entity/EntityFormControllerNG.php

@@ -28,7 +28,7 @@ public function form(array $form, array &$form_state) {
     // entity fields.
     $info = $entity->entityInfo();
     if (!empty($info['fieldable'])) {
-      field_attach_form($entity->getBCEntity(), $form, $form_state, $this->getFormLangcode($form_state));
+      field_attach_form($entity, $form, $form_state, $this->getFormLangcode($form_state));
     }
     return $form;
   }
@@ -43,7 +43,7 @@ public function validate(array $form, array &$form_state) {
     $info = $entity->entityInfo();
 
     if (!empty($info['fieldable'])) {
-      field_attach_form_validate($entity->getBCEntity(), $form, $form_state);
+      field_attach_form_validate($entity, $form, $form_state);
     }
 
     // @todo Remove this.
@@ -93,7 +93,7 @@ public function buildEntity(array $form, array &$form_state) {
 
     // Invoke field API for copying field values.
     if ($info['fieldable']) {
-      field_attach_extract_form_values($entity->getBCEntity(), $form, $form_state);
+      field_attach_extract_form_values($entity, $form, $form_state);
     }
     return $entity;
   }

core/modules/field/field.attach.inc

@@ -822,6 +822,9 @@ function _field_invoke_widget_target() {
  * @see field_form_set_state()
  */
 function field_attach_form(EntityInterface $entity, &$form, &$form_state, $langcode = NULL, array $options = array()) {
+  // Ensure we are working with a BC mode entity.
+  $entity = $entity->getBCEntity();
+
   // Set #parents to 'top-level' by default.
   $form += array('#parents' => array());
 
@@ -893,6 +896,11 @@ function field_attach_load($entity_type, $entities, $age = FIELD_LOAD_CURRENT, $
     return;
   }
 
+  // Ensure we are working with a BC mode entity.
+  foreach ($entities as $id => $entity) {
+    $entities[$id] = $entity->getBCEntity();
+  }
+
   // Assume all entities will need to be queried. Entities found in the cache
   // will be removed from the list.
   $queried_entities = $entities;
@@ -1029,6 +1037,9 @@ function field_attach_load_revision($entity_type, $entities, $options = array())
  *   details.
  */
 function field_attach_validate(EntityInterface $entity, array $options = array()) {
+  // Ensure we are working with a BC mode entity.
+  $entity = $entity->getBCEntity();
+
   $errors = array();
   // Check generic, field-type-agnostic errors first.
   $null = NULL;
@@ -1078,6 +1089,9 @@ function field_attach_validate(EntityInterface $entity, array $options = array()
  *   details.
  */
 function field_attach_form_validate(EntityInterface $entity, $form, &$form_state, array $options = array()) {
+  // Ensure we are working with a BC mode entity.
+  $entity = $entity->getBCEntity();
+
   // Perform field_level validation.
   try {
     field_attach_validate($entity, $options);
@@ -1115,6 +1129,9 @@ function field_attach_form_validate(EntityInterface $entity, $form, &$form_state
  *   details.
  */
 function field_attach_extract_form_values(EntityInterface $entity, $form, &$form_state, array $options = array()) {
+  // Ensure we are working with a BC mode entity.
+  $entity = $entity->getBCEntity();
+
   // Extract field values from submitted values.
   field_invoke_method('extractFormValues', _field_invoke_widget_target(), $entity, $form, $form_state, $options);
 
@@ -1136,6 +1153,9 @@ function field_attach_extract_form_values(EntityInterface $entity, $form, &$form
  *   The entity with fields to process.
  */
 function field_attach_presave($entity) {
+  // Ensure we are working with a BC mode entity.
+  $entity = $entity->getBCEntity();
+
   _field_invoke('presave', $entity);
 
   // Let other modules act on presaving the entity.
@@ -1157,6 +1177,9 @@ function field_attach_presave($entity) {
  *   it leaves unspecified.
  */
 function field_attach_insert(EntityInterface $entity) {
+  // Ensure we are working with a BC mode entity.
+  $entity = $entity->getBCEntity();
+
   _field_invoke('insert', $entity);
 
   // Let any module insert field data before the storage engine, accumulating
@@ -1198,6 +1221,9 @@ function field_attach_insert(EntityInterface $entity) {
  *   The entity with fields to save.
  */
 function field_attach_update(EntityInterface $entity) {
+  // Ensure we are working with a BC mode entity.
+  $entity = $entity->getBCEntity();
+
   _field_invoke('update', $entity);
 
   // Let any module update field data before the storage engine, accumulating
@@ -1249,6 +1275,9 @@ function field_attach_update(EntityInterface $entity) {
  *   The entity whose field data to delete.
  */
 function field_attach_delete(EntityInterface $entity) {
+  // Ensure we are working with a BC mode entity.
+  $entity = $entity->getBCEntity();
+
   _field_invoke('delete', $entity);
 
   // Collect the storage backends used by the fields in the entities.
@@ -1282,6 +1311,9 @@ function field_attach_delete(EntityInterface $entity) {
  *   The entity with fields to save.
  */
 function field_attach_delete_revision(EntityInterface $entity) {
+  // Ensure we are working with a BC mode entity.
+  $entity = $entity->getBCEntity();
+
   _field_invoke('delete_revision', $entity);
 
   // Collect the storage backends used by the fields in the entities.
@@ -1338,7 +1370,7 @@ function field_attach_prepare_view($entity_type, array $entities, array $display
   $prepare = array();
   foreach ($entities as $id => $entity) {
     if (empty($entity->_field_view_prepared)) {
-      // Enable BC if necessary.
+      // Ensure we are working with a BC mode entity.
       $entity = $entity->getBCEntity();
 
       // Add this entity to the items to be prepared.
@@ -1415,7 +1447,7 @@ function field_attach_prepare_view($entity_type, array $entities, array $display
  *   A renderable array for the field values.
  */
 function field_attach_view(EntityInterface $entity, EntityDisplay $display, $langcode = NULL, array $options = array()) {
-  // Enable BC if necessary.
+  // Ensure we are working with a BC mode entity.
   $entity = $entity->getBCEntity();
   // Determine the actual language code to display for each field, given the
   // language codes available in the field data.
@@ -1466,7 +1498,7 @@ function field_attach_view(EntityInterface $entity, EntityDisplay $display, $lan
  *   values.
  */
 function field_attach_preprocess(EntityInterface $entity, $element, &$variables) {
-  // Enable BC if necessary.
+  // Ensure we are working with a BC mode entity.
   $entity = $entity->getBCEntity();
   foreach (field_info_instances($entity->entityType(), $entity->bundle()) as $instance) {
     $field_name = $instance['field_name'];
@@ -1506,6 +1538,9 @@ function field_attach_preprocess(EntityInterface $entity, $element, &$variables)
  *   The source language from which translate.
  */
 function field_attach_prepare_translation(EntityInterface $entity, $langcode, EntityInterface $source_entity, $source_langcode) {
+  // Ensure we are working with a BC mode entity.
+  $entity = $entity->getBCEntity();
+
   $options = array('langcode' => $langcode);
   // Copy source field values into the entity to be prepared.
   _field_invoke_default('prepare_translation', $entity, $source_entity, $source_langcode, $options);