diff --git a/modules/callbacks.inc b/modules/callbacks.inc index 493cc40..35c1235 100644 --- a/modules/callbacks.inc +++ b/modules/callbacks.inc @@ -402,7 +402,7 @@ function entity_metadata_field_property_get($entity, array $options, $name, $ent function entity_metadata_field_property_set($entity, $name, $value, $langcode, $entity_type) { $field = field_info_field($name); $columns = array_keys($field['columns']); - if (!isset($langcode)) { + if (!isset($langcode) || $field['translatable']) { // Try to figure out the default language used by the entity. // @todo: Update once http://drupal.org/node/1260640 has been fixed. $langcode = isset($entity->language) ? $entity->language : LANGUAGE_NONE; @@ -457,7 +457,7 @@ function entity_metadata_field_verbatim_get($entity, array $options, $name, $ent */ function entity_metadata_field_verbatim_set($entity, $name, $items, $langcode) { $field = field_info_field($name); - if (!isset($langcode)) { + if (!isset($langcode) || $field['translatable']) { // Try to figure out the default language used by the entity. // @todo: Update once http://drupal.org/node/1260640 has been fixed. $langcode = isset($entity->language) ? $entity->language : LANGUAGE_NONE;