diff --git a/modules/node_export_relation/node_export_relation.taxonomy.inc b/modules/node_export_relation/node_export_relation.taxonomy.inc index 8e9f17c..223aaaa 100644 --- a/modules/node_export_relation/node_export_relation.taxonomy.inc +++ b/modules/node_export_relation/node_export_relation.taxonomy.inc @@ -71,4 +71,4 @@ function node_export_relation_taxonomy_term_reference_fields($node) { } } return $reference_fields; -} \ No newline at end of file +} diff --git a/node_export.module b/node_export.module index 8bdadb9..7a28a4b 100755 --- a/node_export.module +++ b/node_export.module @@ -1090,15 +1090,16 @@ function node_export_file_field_import(&$node, $original_node) { // fields with different language than the node one. foreach($field as $language => $files) { if (is_array($files)) { - foreach($files as $i => $file) { + foreach($files as $i => $field_value) { - // Convert file to array to stay into the default node_export_file format. - $file = (object)$file; + $file = (object) $field_value; $result = _node_export_file_field_import_file($file); + // The file was saved successfully, update the file field (by reference). if ($result == TRUE && isset($file->fid)) { - $field[$language][$i] = (array)$file; + // Retain any extra properties from the original field value. + $field[$language][$i] = array_merge($field_value, (array) $file); } }