Index: 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
--- markup.inc	9 Jan 2009 08:31:06 -0000	1.5.2.7
+++ markup.inc	10 Feb 2010 03:18:40 -0000
@@ -34,15 +34,16 @@
 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'],
     '#description' => t('Markup allows you to enter custom HTML or PHP logic into your form.') . theme('webform_token_help'),
     '#weight' => -1,
+    '#parents' => array('value'),
   );
   // 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();