Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions field_collection.module
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ function field_collection_item_is_empty(FieldCollectionItemEntity $item) {
// If at least one collection-field is not empty; the
// field collection item is not empty.
foreach ($item->{$field_name}[$langcode] as $field_item) {
if (!module_invoke($field['module'], 'field_is_empty', $field_item, $field)) {
if (!module_invoke($field['module'], 'field_is_empty', $field_item, $field, $instance)) {
$is_empty = FALSE;
}
}
Expand Down Expand Up @@ -1804,7 +1804,8 @@ function field_collection_field_widget_embed_validate($element, &$form_state, $c
$field_values = reset($field_values);
}

$is_empty_field = module_invoke($field['module'], 'field_is_empty', $field_values, $field);
$instance = field_widget_instance($element, $form_state);
$is_empty_field = module_invoke($field['module'], 'field_is_empty', $field_values, $field, $instance);
}

if ($is_empty_multiple || $is_empty_string || $is_empty_value || $is_empty_option || $is_empty_field) {
Expand Down