summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-29 07:43:58 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-29 07:43:58 +0000
commit839c242be1608ed833294a9d3b5d1129fa77ac77 (patch)
treee3549c231e5874eea4fa7642958c6bcea962f2c3
parentfeb4845493121078ca6c3eb511f4ea69b0cb1809 (diff)
downloadbrdo-839c242be1608ed833294a9d3b5d1129fa77ac77.tar.gz
brdo-839c242be1608ed833294a9d3b5d1129fa77ac77.tar.bz2
#554290 by yched: Fixed lost field weights when submitting 'Display fields' screen.
-rw-r--r--modules/field_ui/field_ui.admin.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc
index 11bd18381..34dafb1da 100644
--- a/modules/field_ui/field_ui.admin.inc
+++ b/modules/field_ui/field_ui.admin.inc
@@ -658,8 +658,11 @@ function field_ui_display_overview_form_submit($form, &$form_state) {
foreach ($form_values as $key => $values) {
if (in_array($key, $form['#fields'])) {
$instance = field_info_instance($key, $form['#bundle']);
- unset($values['weight']);
- $instance['display'] = array_merge($instance['display'], $values);
+ foreach ($instance['display'] as $build_mode => $display) {
+ if (isset($values[$build_mode])) {
+ $instance['display'][$build_mode] = array_merge($instance['display'][$build_mode], $values[$build_mode]);
+ }
+ }
field_update_instance($instance);
}
}