From 00ad7e8e032f94c85874b2ee168db8864248cce2 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Thu, 13 Aug 2009 01:50:00 +0000
Subject: #529756 by yched: Allow fields to be weighted per context.

---
 modules/field/field.form.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'modules/field/field.form.inc')

diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc
index 7b4e88536..20998c349 100644
--- a/modules/field/field.form.inc
+++ b/modules/field/field.form.inc
@@ -90,7 +90,7 @@ function field_default_form($obj_type, $object, $field, $instance, $items, &$for
     $defaults = array(
       '#field_name' => $field['field_name'],
       '#tree' => TRUE,
-      '#weight' => $instance['weight'],
+      '#weight' => $instance['widget']['weight'],
     );
 
     $addition[$field['field_name']] = array_merge($form_element, $defaults);
@@ -188,7 +188,6 @@ function field_multiple_value_form($field, $instance, $items, &$form, &$form_sta
         '#type' => 'submit',
         '#name' => $field_name . '_add_more',
         '#value' => t('Add another item'),
-        '#weight' => $instance['weight'] + $max + 1,
         // Submit callback for disabled JavaScript.
         '#submit' => array('field_add_more_submit'),
         '#ahah' => array(
-- 
cgit v1.2.3