Index: webform.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v
retrieving revision 1.196.2.11
diff -u -r1.196.2.11 webform.module
--- webform.module	27 Mar 2010 18:21:06 -0000	1.196.2.11
+++ webform.module	27 Mar 2010 22:46:09 -0000
@@ -1101,7 +1101,10 @@
   // Add the output to the node.
   $node = node_prepare($node, $teaser);
   if (isset($output)) {
-    $node->content['webform'] = array('#value' => $output, '#weight' => 10);
+    if (module_exists('content')) {
+      $weight = content_extra_field_weight($node->type, 'webform');
+    }
+    $node->content['webform'] = array('#value' => $output, '#weight' => isset($weight) ? $weight : 10);
   }
 }
 
@@ -2730,6 +2733,21 @@
 }
 
 /**
+ * Implementation of hook_content_extra_fields().
+ */
+function webform_content_extra_fields($type_name) {
+  $extra = array();
+  if (in_array($type_name, webform_variable_get('webform_node_types'))) {
+    $extra['webform'] = array(
+      'label' => t('Webform'),
+      'description' => t('Webform client form.'),
+      'weight' => 10
+    );
+  }
+  return $extra;
+}
+
+/**
  * Implements hook_mollom_form_list().
  */
 function webform_mollom_form_list() {