summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/file/file.field.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc
index 319cd5840..c841f60ee 100644
--- a/modules/file/file.field.inc
+++ b/modules/file/file.field.inc
@@ -186,7 +186,7 @@ function file_field_load($entity_type, $entities, $field, $instances, $langcode,
$items[$id][$delta] = NULL;
}
else {
- $items[$id][$delta] = array_merge($item, (array) $files[$item['fid']]);
+ $items[$id][$delta] = array_merge((array) $files[$item['fid']], $item);
}
}
}