Index: form_markup.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/form_markup/form_markup.module,v
retrieving revision 1.2
diff -u -r1.2 form_markup.module
--- form_markup.module	28 Aug 2006 21:38:41 -0000	1.2
+++ form_markup.module	29 Aug 2006 14:17:57 -0000
@@ -44,8 +44,8 @@
       }
     }
     
-    foreach ($form as $field_name => $field_values) {
-      if (is_array($markup_fields[$field_name])) {
+    foreach ($markup_fields as $field_name => $settings) {
+      if (is_array($form[$field_name])) {
         if ($markup_fields[$field_name]['prefix']) $form[$field_name]['#prefix'] = $markup_fields[$field_name]['prefix'];
         if ($markup_fields[$field_name]['suffix']) $form[$field_name]['#suffix'] = $markup_fields[$field_name]['suffix'];
         unset($markup_fields[$field_name]);
@@ -62,15 +62,15 @@
         '#type' => 'textfield',
         '#title' => t('Prefix'),
         '#size' => 60,
-        '#default_value' => form_markup_get_default_value($form['type_name']['#value'], $form['field_name']['#value'], 'prefix'),
+        '#default_value' => _form_markup_get_default_value($form['type_name']['#value'], $form['field_name']['#value'], 'prefix'),
       );
       $form['widget']['markup']['suffix'] = array(
         '#type' => 'textfield',
         '#title' => t('Suffix'),
         '#size' => 60,
-        '#default_value' => form_markup_get_default_value($form['type_name']['#value'], $form['field_name']['#value'], 'suffix'),
+        '#default_value' => _form_markup_get_default_value($form['type_name']['#value'], $form['field_name']['#value'], 'suffix'),
       );
-      $form['#submit'] = (array)$form['#submit'] + array('form_markup_submit' => array());
+      $form['#submit']['form_markup_submit'] = array();
   }
 }
 
@@ -88,7 +88,7 @@
 }
 
 
-function form_markup_get_default_value($type_name, $field_name, $value) {
+function _form_markup_get_default_value($type_name, $field_name, $value) {
   $info = _content_type_info();
   return $info['content types'][$type_name]['fields'][$field_name]['widget'][$value];
 }