#896162 by yched: Fixed Field UI 'formatter settings' form broken.

1 files changed, 6 insertions, 4 deletions

diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc
index 3ef665b87..2e0392ff8 100644
--- a/modules/field_ui/field_ui.admin.inc
+++ b/modules/field_ui/field_ui.admin.inc
@@ -840,8 +840,9 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
           '#name' => $name . '_formatter_settings_cancel',
           '#value' => t('Cancel'),
           '#op' => 'cancel',
-          // Do not check errors for the 'Cancel' button.
-          '#limit_validation_errors' => array(),
+          // Do not check errors for the 'Cancel' button. We still need the
+          // value of the 'formatter type' select in $form_state['values'].
+          '#limit_validation_errors' => array(array('settings', $name, 'type'))
         );
         $table[$name]['#settings_editing'] = TRUE;
         // When formatter is changed, cancel the currently edited settings. The
@@ -865,8 +866,9 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
           '#src' => 'misc/configure.png',
           '#attributes' => array('class' => array('field-formatter-settings-edit'), 'alt' => t('Edit')),
           '#op' => 'edit',
-          // Do not check errors for the 'Edit' button.
-          '#limit_validation_errors' => array(),
+          // Do not check errors for the 'Edit' button. We still need the value
+          // of the 'formatter type' select in $form_state['values'].
+          '#limit_validation_errors' => array(array('settings', $name, 'type')),
           '#prefix' => '<div class="field-formatter-settings-edit-wrapper">',
           '#suffix' => '</div>',
         );