Index: webform.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v
retrieving revision 1.226
diff -u -p -r1.226 webform.module
--- webform.module	1 May 2010 20:17:01 -0000	1.226
+++ webform.module	3 Jun 2010 13:30:40 -0000
@@ -1207,6 +1207,14 @@ function webform_node_view(&$node, $view
     theme('webform_view_messages', array('node' => $node, 'teaser' => $teaser, 'page' => $page, 'submission_count' => $submission_count, 'limit_exceeded' => $limit_exceeded, 'allowed_roles' => $allowed_roles));
   }
 
+  // Get weight
+  $fieldinfo = field_extra_fields('node', $node->type, 'display');
+  if (isset($fieldinfo['webform'])) {
+    $weight = $fieldinfo['webform']['weight']; 	   
+  } else {
+    $weight = 0;
+  }
+
   // Add the output to the node.
   $node->content['webform'] = array(
     '#theme' => 'webform_view',
@@ -1215,7 +1223,7 @@ function webform_node_view(&$node, $view
     '#page' => $page,
     '#form' => $form,
     '#enabled' => $enabled,
-    '#weight' => field_extra_field_weight('node', $node->type, 'webform'),
+    '#weight' => $weight,
   );
 }