Commit 317c8ec0 authored by quicksketch's avatar quicksketch

#841212: warning: array_merge() [function.array-merge]: Argument #1 is not an...

#841212: warning: array_merge() [function.array-merge]: Argument #1 is not an array in..../filefield_field.inc on line 292.
parent 38fde101
......@@ -289,9 +289,9 @@ function filefield_field_sanitize($node, $field, &$items, $teaser, $page) {
if (!empty($item['fid']) && empty($item['filepath'])) {
$file = (array) field_file_load($item['fid']);
if (isset($file['data'])) {
$items[$delta]['data'] = array_merge($item['data'], $file['data']);
$file['data'] = array_merge($items[$delta]['data'], $file['data']);
}
$items[$delta] = array_merge($item, $file);
$items[$delta] = array_merge($items[$delta], $file);
}
// Verify the file exists on the server.
......
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