From de8325a3efd814614174917ab57be2d634f41b07 Mon Sep 17 00:00:00 2001 From: webchick Date: Mon, 23 May 2011 16:11:56 -0700 Subject: Issue #1089174 follow-up by plach: Fix notices and expand tests. --- modules/field/field.attach.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/field/field.attach.inc') diff --git a/modules/field/field.attach.inc b/modules/field/field.attach.inc index 3b15c76c8..4ca15f543 100644 --- a/modules/field/field.attach.inc +++ b/modules/field/field.attach.inc @@ -348,7 +348,7 @@ function _field_invoke_multiple($op, $entity_type, $entities, &$a = NULL, &$b = // fields with an empty array (those are not equivalent on update). foreach ($grouped_entities[$field_id] as $id => $entity) { foreach ($grouped_items[$field_id] as $langcode => $items) { - if ($grouped_items[$field_id][$langcode][$id] !== array() || isset($entity->{$field_name}[$langcode])) { + if (isset($grouped_items[$field_id][$langcode][$id]) && ($grouped_items[$field_id][$langcode][$id] !== array() || isset($entity->{$field_name}[$langcode]))) { $entity->{$field_name}[$langcode] = $grouped_items[$field_id][$langcode][$id]; } } -- cgit v1.2.3