diff --git a/title.module b/title.module index ef106e9..46a559d 100644 --- a/title.module +++ b/title.module @@ -234,7 +234,6 @@ function title_field_replacement_enabled($entity_type, $bundle, $legacy_field) { */ function title_field_replacement_toggle($entity_type, $bundle, $legacy_field) { $info = title_field_replacement_info($entity_type, $legacy_field); - if (!$info) { return; } @@ -826,18 +825,19 @@ function title_field_attach_create_bundle($entity_type, $bundle) { } // Do not continue if the replacement field already exists. - if (field_info_instance($entity_type, $field_name, $bundle)) { + if (field_info_instance($entity_type, $entity_info['field replacement'][$field_name]['field']['field_name'], $bundle)) { continue; } title_field_replacement_toggle($entity_type, $bundle, $field_name); - - $instance = field_info_instance($entity_type, $field_name, $bundle); - $params = array( - '@entity_label' => drupal_strtolower($entity_info['label']), - '%field_name' => t($entity_info['field replacement'][$field_name]['instance']['label']), - ); - - drupal_set_message(t('The @entity_label %field_name field was automatically replaced.', $params)); + $instance = field_info_instance($entity_type, $entity_info['field replacement'][$field_name]['field']['field_name'], $bundle); + if ($instance) { + $params = array( + '@entity_label' => drupal_strtolower($entity_info['label']), + '%field_name' => t($entity_info['field replacement'][$field_name]['instance']['label']), + ); + + drupal_set_message(t('The @entity_label %field_name field was automatically replaced.', $params)); + } } }