diff --git a/includes/common.inc b/includes/common.inc index 51d2602..bae2ccb 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -7646,7 +7646,9 @@ function entity_form_field_validate($entity_type, $form, &$form_state) { // until we have fully validated the submitted input. Therefore, for // validation, act on a pseudo entity created out of the form values. $pseudo_entity = (object) $form_state['values']; - $pseudo_entity->original = $form_state['entity_original']; + if (!empty($form_state['entity_original'])) { + $pseudo_entity->original = $form_state['entity_original']; + } field_attach_form_validate($entity_type, $pseudo_entity, $form, $form_state); }