Commit 42c6ca6c authored by quicksketch's avatar quicksketch

Issue #791118 by nonzero: warning: array_merge(): Argument #2 is not

an array.
parent ff175660
...@@ -135,7 +135,9 @@ function filefield_field_load($node, $field, &$items, $teaser, $page) { ...@@ -135,7 +135,9 @@ function filefield_field_load($node, $field, &$items, $teaser, $page) {
$items[$delta] = NULL; $items[$delta] = NULL;
} }
else { else {
$item['data'] = unserialize($item['data']); if (isset($item['data']) && !empty($item['data'])) {
$item['data'] = unserialize($item['data']);
}
// Temporary fix to unserialize data serialized multiple times. // Temporary fix to unserialize data serialized multiple times.
// See the FileField issue http://drupal.org/node/402860. // See the FileField issue http://drupal.org/node/402860.
// And the CCK issue http://drupal.org/node/407446. // And the CCK issue http://drupal.org/node/407446.
......
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