diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-15 04:13:48 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-15 04:13:48 +0000 |
| commit | c2ec8e397a1479b28a02af79af4b75390ad57c2e (patch) | |
| tree | 0c0e810f3fccc258afabb88ebaaaf060bff86a0c /modules/field_ui | |
| parent | 72e8023d493a7d99af2e84878f40cd8eeef07be7 (diff) | |
| download | brdo-c2ec8e397a1479b28a02af79af4b75390ad57c2e.tar.gz brdo-c2ec8e397a1479b28a02af79af4b75390ad57c2e.tar.bz2 | |
#915906 by jbrown, yched: Fixed Deleting node type with only instance of a field leaves the field in a strange zombie state
Diffstat (limited to 'modules/field_ui')
| -rw-r--r-- | modules/field_ui/field_ui.admin.inc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc index fdddb018a..6274d5ab1 100644 --- a/modules/field_ui/field_ui.admin.inc +++ b/modules/field_ui/field_ui.admin.inc @@ -1706,10 +1706,6 @@ function field_ui_field_delete_form_submit($form, &$form_state) { if (!empty($bundle) && $field && !$field['locked'] && $form_values['confirm']) { field_delete_instance($instance); - // Delete the field if that was the last instance. - if (count($field['bundles']) == 1 && count(current($field['bundles'])) == 1) { - field_delete_field($field['field_name']); - } drupal_set_message(t('The field %field has been deleted from the %type content type.', array('%field' => $instance['label'], '%type' => $bundle_label))); } else { |