Commit 829ad724 authored by quicksketch's avatar quicksketch

Issue #2033023: warning: array_merge() [function.array-merge]: Argument #2 is...

Issue #2033023: warning: array_merge() [function.array-merge]: Argument #2 is not an array - back in version 6.x-3.11.
parent b48d9110
......@@ -305,7 +305,7 @@ function filefield_field_sanitize($node, $field, &$items, $teaser, $page) {
// Load the complete file if a filepath is not available.
if (!empty($item['fid']) && empty($item['filepath'])) {
$file = (array) field_file_load($item['fid']);
if (isset($file['data'])) {
if (isset($file['data']) && isset($items[$delta]['data'])) {
$file['data'] = array_merge($file['data'], $items[$delta]['data']);
}
$items[$delta] = array_merge($file, $items[$delta]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment