Index: components/markup.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/markup.inc,v
retrieving revision 1.5.2.7
diff -u -r1.5.2.7 markup.inc
--- components/markup.inc	9 Jan 2009 08:31:06 -0000	1.5.2.7
+++ components/markup.inc	6 Aug 2009 00:05:40 -0000
@@ -34,7 +34,7 @@
 function _webform_edit_markup($currfield) {
   $edit_fields = array();
   $edit_fields['advanced']['mandatory'] = array(); // Do not render the mandatory checkbox.
-  $edit_fields['value'] = array(
+  $edit_fields['markup']['value'] = array(
     '#type' => 'textarea',
     '#title' => t('Value'),
     '#default_value' => $currfield['value'],
@@ -42,7 +42,7 @@
     '#weight' => -1,
   );
   // Add the filter form.
-  $edit_fields['extra']['format'] = filter_form($currfield['extra']['format'], 0, array('extra', 'format'));
+  $edit_fields['markup']['format'] = filter_form($currfield['extra']['format'], 0, array('extra', 'format'));
 
   // No description for markup.
   $edit_fields['extra']['description'] = array();
Index: webform_components.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/Attic/webform_components.inc,v
retrieving revision 1.9.2.29
diff -u -r1.9.2.29 webform_components.inc
--- webform_components.inc	3 Jun 2009 19:47:15 -0000	1.9.2.29
+++ webform_components.inc	6 Aug 2009 00:04:07 -0000
@@ -502,6 +502,10 @@
 function webform_component_insert($component) {
   db_lock_table('webform_component');
   $component['cid'] = isset($component['cid']) ? $component['cid'] : db_result(db_query('SELECT MAX(cid) FROM {webform_component} WHERE nid = %d', $component['nid'])) + 1;
+  // Remove markup group for db storage, but don't overwrite other values.
+  if (isset($component['markup']['value'])) {
+    $component['value'] = $component['markup']['value'];
+  }
   $component['value'] = isset($component['value']) ? $component['value'] : NULL;
   $component['mandatory'] = isset($component['mandatory']) ? $component['mandatory'] : 0;
   db_query("INSERT INTO {webform_component} (nid, cid, pid, form_key, name, type, value, extra, mandatory, weight, email) VALUES (%d, %d, %d, '%s', '%s', '%s', '%s', '%s', %d, %d, %d)", $component['nid'], $component['cid'], $component['pid'], $component['form_key'], $component['name'], $component['type'], $component['value'], serialize($component['extra']), $component['mandatory'], $component['weight'], $component['email']);
@@ -517,6 +521,10 @@
  *   component form. Additional properties are stored in the extra array.
  */
 function webform_component_update($component) {
+  // Remove markup group for db storage, but don't overwrite other values.
+  if (isset($component['markup']['value'])) {
+    $component['value'] = $component['markup']['value'];
+  }
   $component['value'] = isset($component['value']) ? $component['value'] : NULL;
   $component['mandatory'] = isset($component['mandatory']) ? $component['mandatory'] : 0;
   return db_query("UPDATE {webform_component} SET pid = %d, form_key = '%s', name = '%s', type = '%s', value = '%s', extra = '%s', mandatory = %d, weight = %d, email = %d WHERE nid = %d AND cid = %d", $component['pid'], $component['form_key'], $component['name'], $component['type'], $component['value'], serialize($component['extra']), $component['mandatory'], $component['weight'], $component['email'], $component['nid'], $component['cid']);