diff options
Diffstat (limited to 'modules/field_ui/field_ui.admin.inc')
| -rw-r--r-- | modules/field_ui/field_ui.admin.inc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc index 4104e04cf..a3bba857e 100644 --- a/modules/field_ui/field_ui.admin.inc +++ b/modules/field_ui/field_ui.admin.inc @@ -812,9 +812,9 @@ function field_ui_existing_field_options($obj_type, $bundle) { /** * Menu callback; presents the field settings edit page. */ -function field_ui_field_settings_form($form, &$form_state, $obj_type, $bundle, $instance) { +function field_ui_field_settings_form($form, &$form_state, $obj_type, $bundle, $field) { $bundle = field_extract_bundle($obj_type, $bundle); - $field = field_info_field($instance['field_name']); + $instance = field_info_instance($obj_type, $field['field_name'], $bundle); // When a field is first created, we have to get data from the db. if (!isset($instance['label'])) { @@ -900,9 +900,11 @@ function field_ui_field_settings_form_submit($form, &$form_state) { /** * Menu callback; select a widget for the field. */ -function field_ui_widget_type_form($form, &$form_state, $obj_type, $bundle, $instance) { +function field_ui_widget_type_form($form, &$form_state, $obj_type, $bundle, $field) { $bundle = field_extract_bundle($obj_type, $bundle); - $field = field_read_field($instance['field_name']); + $instance = field_info_instance($obj_type, $field['field_name'], $bundle); + + drupal_set_title($instance['label']); $field_type = field_info_field_types($field['type']); $widget_type = field_info_widget_types($instance['widget']['type']); @@ -960,9 +962,9 @@ function field_ui_widget_type_form_submit($form, &$form_state) { /** * Menu callback; present a form for removing a field from a content type. */ -function field_ui_field_delete_form($form, &$form_state, $obj_type, $bundle, $instance) { +function field_ui_field_delete_form($form, &$form_state, $obj_type, $bundle, $field) { $bundle = field_extract_bundle($obj_type, $bundle); - $field = field_info_field($instance['field_name']); + $instance = field_info_instance($obj_type, $field['field_name'], $bundle); $admin_path = _field_ui_bundle_admin_path($obj_type, $bundle); $form['object_type'] = array('#type' => 'value', '#value' => $obj_type); @@ -1017,10 +1019,10 @@ function field_ui_field_delete_form_submit($form, &$form_state) { /** * Menu callback; presents the field instance edit page. */ -function field_ui_field_edit_form($form, &$form_state, $obj_type, $bundle, $instance) { +function field_ui_field_edit_form($form, &$form_state, $obj_type, $bundle, $field) { $bundle = field_extract_bundle($obj_type, $bundle); + $instance = field_info_instance($obj_type, $field['field_name'], $bundle); - $field = field_info_field($instance['field_name']); $form['#field'] = $field; if (!empty($field['locked'])) { |