diff options
Diffstat (limited to 'modules/field')
| -rw-r--r-- | modules/field/field.form.inc | 5 | ||||
| -rw-r--r-- | modules/field/tests/field.test | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc index 8b893ed32..f450dcae4 100644 --- a/modules/field/field.form.inc +++ b/modules/field/field.form.inc @@ -131,6 +131,11 @@ function field_default_form($obj_type, $object, $field, $instance, $langcode, $i * - drag-n-drop value reordering */ function field_multiple_value_form($field, $instance, $langcode, $items, &$form, &$form_state) { + // This form has its own multistep persistance. + if ($form_state['rebuild']) { + $form_state['input'] = array(); + } + $field_name = $field['field_name']; // Determine the number of widgets to display. diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test index 8d2a55e50..5d7a847b9 100644 --- a/modules/field/tests/field.test +++ b/modules/field/tests/field.test @@ -1071,7 +1071,8 @@ class FieldAttachOtherTestCase extends FieldAttachTestCase { $entity_type = 'test_entity'; $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - $form = $form_state = array(); + $form = array(); + $form_state = form_state_defaults(); field_attach_form($entity_type, $entity, $form, $form_state); $langcode = FIELD_LANGUAGE_NONE; @@ -1090,7 +1091,8 @@ class FieldAttachOtherTestCase extends FieldAttachTestCase { $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); // Build the form. - $form = $form_state = array(); + $form = array(); + $form_state = form_state_defaults(); field_attach_form($entity_type, $entity, $form, $form_state); // Simulate incoming values. |