diff options
| author | Dries Buytaert <dries@buytaert.net> | 2011-05-23 21:00:54 -0400 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2011-05-23 21:00:54 -0400 |
| commit | 259d0b8feca71d49c2f79dcce53b3147f7429b75 (patch) | |
| tree | 2a1c29bbd6ecefb410f9b34a3ffbba65d1f09f8f /modules/field/field.attach.inc | |
| parent | 1f17b2c1e2cc602faa99f40f8c0c305df7e17cde (diff) | |
| parent | 6c57cfa11d58e8c3b6dd5ccc663ce15e2b8842cd (diff) | |
| download | brdo-259d0b8feca71d49c2f79dcce53b3147f7429b75.tar.gz brdo-259d0b8feca71d49c2f79dcce53b3147f7429b75.tar.bz2 | |
Merge branch '7.x' of git.drupal.org:project/drupal into 7.x
Diffstat (limited to 'modules/field/field.attach.inc')
| -rw-r--r-- | modules/field/field.attach.inc | 2 |
1 files changed, 1 insertions, 1 deletions
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]; } } |