diff -drup a/entityreference_prepopulate.module b/entityreference_prepopulate.module --- a/entityreference_prepopulate.module Fri Jan 4 13:25:42 2013 +++ b/entityreference_prepopulate.module Fri Jan 4 14:40:54 2013 @@ -64,27 +64,19 @@ function entityreference_prepopulate_fie } /** - * Default value callback for Organic groups; Filter results by field-mode. + * Default value callback for Organic groups. */ function entityreference_prepopulate_og_field_default_value($entity_type, $entity, $field, $instance, $langcode) { - if (empty($instance['field_mode'])) { - return; - } - if ($items = entityreference_prepopulate_get_values($field, $instance)) { - // Filter out the items that don't match the field-mode. - $gids = array(); - foreach ($items as $item) { - $gids[] = $item['target_id']; - } - if (!$valid_ids = entityreference_get_selection_handler($field, $instance, $entity_type, $entity)->validateReferencableEntities($gids)) { - return; - } - $valid_items = array(); + $valid_items = array(); + $ids = entityreference_prepopulate_get_values($field, $instance, TRUE); + if (!empty($ids)) { + // Filter out invalid items. + $valid_ids = entityreference_get_selection_handler($field, $instance, $entity_type, $entity)->validateReferencableEntities($ids); foreach ($valid_ids as $valid_id) { $valid_items[] = array('target_id' => $valid_id); } - return $valid_items; } + return $valid_items; } /**