diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-08-24 21:00:23 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-08-24 21:00:23 +0000 |
| commit | 1378428913d6f4a2e9e563d296d589d8f12ef006 (patch) | |
| tree | 63bc80882c5011f11054ff8693a53310770b76e3 /modules/field_ui | |
| parent | 998697675ffa95c2f33cc5169d44b0276e48c4ac (diff) | |
| download | brdo-1378428913d6f4a2e9e563d296d589d8f12ef006.tar.gz brdo-1378428913d6f4a2e9e563d296d589d8f12ef006.tar.bz2 | |
#557932 by plach and bangpound: Fixed taxonomy term field autocomplete widgets validation, which broke after translatable fields.
Diffstat (limited to 'modules/field_ui')
| -rw-r--r-- | modules/field_ui/field_ui.admin.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc index bb7c01669..26b9a7e9a 100644 --- a/modules/field_ui/field_ui.admin.inc +++ b/modules/field_ui/field_ui.admin.inc @@ -1276,9 +1276,10 @@ function field_ui_field_edit_form_validate($form, &$form_state) { function field_ui_field_edit_form_submit($form, &$form_state) { $form_values = $form_state['values']; $instance = $form_values['instance']; + $field_name = $instance['field_name']; // Update any field settings that have changed. - $field = field_info_field($instance['field_name']); + $field = field_info_field($field_name); // Remove the 'bundles' element added by field_info_field. // @todo This is ugly, there must be a better way. unset($field['bundles']); @@ -1287,7 +1288,8 @@ function field_ui_field_edit_form_submit($form, &$form_state) { // Move the default value from the sample widget to the default value field. if (isset($instance['default_value_widget'])) { - $instance['default_value'] = $instance['default_value_widget'][$instance['field_name']]; + $langcode = $form['instance']['default_value_widget'][$field_name]['#language']; + $instance['default_value'] = $instance['default_value_widget'][$field_name][$langcode]; unset($instance['default_value_widget']); } |