diff options
| author | Dries <dries@buytaert.net> | 2013-08-16 16:05:42 -0500 |
|---|---|---|
| committer | Dries <dries@buytaert.net> | 2013-08-16 16:05:42 -0500 |
| commit | b38421cbb38e14adc91de2963af209ffbca81b38 (patch) | |
| tree | e4775c60b1e6f8fbe96f6a8ab5b3610525b83ffd /modules | |
| parent | de79105a2f0b05f1f1e52f41bfdc6dbf49a96db9 (diff) | |
| download | brdo-b38421cbb38e14adc91de2963af209ffbca81b38.tar.gz brdo-b38421cbb38e14adc91de2963af209ffbca81b38.tar.bz2 | |
Issue #2066275 by Dave Reid: Fixed file_field_load() overwites any field item properties with file entity properties.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/file/file.field.inc | 2 |
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); } } } |