Index: modules/cck/date.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/date.module,v
retrieving revision 1.24
diff -u -r1.24 date.module
--- modules/cck/date.module	19 Aug 2006 22:56:14 -0000	1.24
+++ modules/cck/date.module	28 Aug 2006 20:19:03 -0000
@@ -150,7 +150,9 @@
     case 'form':
       $form = array();
 
-      $form[$field['field_name']] = array('#tree' => TRUE);
+      $form[$field['field_name']] = array(
+        '#tree' => TRUE,
+        '#weight' => $field['widget']['weight']);
 
       if ($field['multiple']) {
         foreach (range(0, 2) as $delta) {
Index: modules/cck/nodereference.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/nodereference.module,v
retrieving revision 1.33
diff -u -r1.33 nodereference.module
--- modules/cck/nodereference.module	19 Aug 2006 23:10:19 -0000	1.33
+++ modules/cck/nodereference.module	28 Aug 2006 20:21:59 -0000
@@ -123,7 +123,10 @@
       case 'form':
         $form = array();
 
-        $form[$field['field_name']] = array('#tree' => TRUE);
+        $form[$field['field_name']] = array(
+          '#tree' => TRUE,
+          '#weight' => $field['widget']['weight']);
+        
         $form[$field['field_name']]['nids'] = array(
           '#type' => 'select',
           '#title' => t($field['widget']['label']),
@@ -157,7 +160,9 @@
 
       case 'form':
         $form = array();
-        $form[$field['field_name']] = array('#tree' => TRUE);
+        $form[$field['field_name']] = array(
+          '#tree' => TRUE,
+          '#weight' => $field['widget']['weight']);
 
         if ($field['multiple']) {
           $form[$field['field_name']]['#type'] = 'fieldset';
Index: modules/cck/number.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/number.module,v
retrieving revision 1.32
diff -u -r1.32 number.module
--- modules/cck/number.module	13 Aug 2006 15:24:41 -0000	1.32
+++ modules/cck/number.module	28 Aug 2006 20:22:49 -0000
@@ -165,7 +165,9 @@
     case 'form':
       $form = array();
 
-      $form[$field['field_name']] = array('#tree' => TRUE);
+      $form[$field['field_name']] = array(
+        '#tree' => TRUE,
+        '#weight' => $field['widget']['weight']);
 
       if ($field['multiple']) {
         $form[$field['field_name']]['#type'] = 'fieldset';
Index: modules/cck/optionwidgets.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/optionwidgets.module,v
retrieving revision 1.9
diff -u -r1.9 optionwidgets.module
--- modules/cck/optionwidgets.module	1 Aug 2006 01:16:58 -0000	1.9
+++ modules/cck/optionwidgets.module	28 Aug 2006 20:23:19 -0000
@@ -64,7 +64,9 @@
 
       $form = array();
 
-      $form[$field['field_name']] = array('#tree' => TRUE);
+      $form[$field['field_name']] = array(
+        '#tree' => TRUE,
+        '#weight' => $field['widget']['weight']);
 
       switch ($field['widget']['type']) {
         case 'options_select':
Index: modules/cck/text.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/text.module,v
retrieving revision 1.38
diff -u -r1.38 text.module
--- modules/cck/text.module	13 Aug 2006 15:24:41 -0000	1.38
+++ modules/cck/text.module	28 Aug 2006 20:24:02 -0000
@@ -199,7 +199,9 @@
     case 'form':
       $form = array();
 
-      $form[$field['field_name']] = array('#tree' => TRUE);
+      $form[$field['field_name']] = array(
+        '#tree' => TRUE,
+        '#weight' => $field['widget']['weight']);
 
       if ($field['multiple']) {
         $form[$field['field_name']]['#type'] = 'fieldset';
@@ -214,7 +216,6 @@
                 '#default_value' => $data['value'],
                 '#required' => ($delta == 0) ? $field['required'] : FALSE,
                 '#maxlength' => $field['max_length'] ? $field['max_length'] : '',
-                '#weight' => $field['widget']['weight'],
               );
             }
             else {
@@ -224,7 +225,6 @@
                 '#default_value' => $data['value'],
                 '#required' => ($delta == 0) ? $field['required'] : FALSE,
                 '#rows' => $field['widget']['rows'],
-                '#weight' => $field['widget']['weight'],
               );
             }
             if ($field['text_processing']) {
@@ -241,7 +241,6 @@
               '#default_value' => '',
               '#required' => ($delta == 0) ? $field['required'] : FALSE,
               '#maxlength' => $field['max_length'] ? $field['max_length'] : '',
-              '#weight' => $field['widget']['weight'],
             );
           }
           else {
@@ -251,7 +250,6 @@
               '#default_value' => '',
               '#required' => ($delta == 0) ? $field['required'] : FALSE,
               '#rows' => $field['widget']['rows'],
-              '#weight' => $field['widget']['weight'],
             );
           }
           if ($field['text_processing']) {
@@ -268,7 +266,6 @@
             '#required' => $field['required'],
             '#description' => $field['widget']['description'],
             '#maxlength' => $field['max_length'] ? $field['max_length'] : '',
-            '#weight' => $field['widget']['weight'],
           );
         }
         else {
@@ -279,7 +276,6 @@
             '#required' => $field['required'],
             '#rows' => $field['widget']['rows'],
             '#description' => $field['widget']['description'],
-            '#weight' => $field['widget']['weight'],
           );
         }
         if ($field['text_processing']) {
Index: modules/cck/userreference.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/userreference.module,v
retrieving revision 1.28
diff -u -r1.28 userreference.module
--- modules/cck/userreference.module	19 Aug 2006 22:04:48 -0000	1.28
+++ modules/cck/userreference.module	28 Aug 2006 20:24:47 -0000
@@ -120,7 +120,10 @@
       case 'form':
         $form = array();
 
-        $form[$field['field_name']] = array('#tree' => TRUE);
+        $form[$field['field_name']] = array(
+          '#tree' => TRUE,
+          '#weight' => $field['widget']['weight']);
+          
         $form[$field['field_name']]['uids'] = array(
           '#type' => 'select',
           '#title' => t($field['widget']['label']),
Index: modules/cck/weburl.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/weburl.module,v
retrieving revision 1.9
diff -u -r1.9 weburl.module
--- modules/cck/weburl.module	1 Aug 2006 01:16:58 -0000	1.9
+++ modules/cck/weburl.module	28 Aug 2006 20:25:08 -0000
@@ -134,7 +134,9 @@
     case 'form':
       $form = array();
 
-      $form[$field['field_name']] = array('#tree' => TRUE);
+      $form[$field['field_name']] = array(
+        '#tree' => TRUE,
+        '#weight' => $field['widget']['weight']);
 
       if ($field['multiple']) {
         foreach (range(0, 2) as $delta) {