diff --git a/core/lib/Drupal/Core/Entity/EntityFormController.php b/core/lib/Drupal/Core/Entity/EntityFormController.php index 7c5f7ed..2ec5fc6 100644 --- a/core/lib/Drupal/Core/Entity/EntityFormController.php +++ b/core/lib/Drupal/Core/Entity/EntityFormController.php @@ -391,6 +391,8 @@ protected function submitEntityLanguage(array $form, array &$form_state) { */ public function buildEntity(array $form, array &$form_state) { $entity = clone $this->entity; + // The form state might still have an form controller before form caching. + $form_state['controller'] = $this; // @todo Move entity_form_submit_build_entity() here. // @todo Exploit the Field API to process the submitted entity field. entity_form_submit_build_entity($entity->entityType(), $entity, $form, $form_state);