? 475884.patch
? patch.patch
Index: conditional_fields.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/conditional_fields/conditional_fields.module,v
retrieving revision 1.1.2.22.2.27
diff -u -p -r1.1.2.22.2.27 conditional_fields.module
--- conditional_fields.module	28 May 2009 14:49:10 -0000	1.1.2.22.2.27
+++ conditional_fields.module	4 Jun 2009 11:08:36 -0000
@@ -218,7 +218,7 @@ function conditional_fields_nodeapi(&$no
           if ($controlled_group) {
             unset($node->content[$controlled_group]['group'][$field['field_name']]);
           }
-          else {
+          else {
             unset($node->content[$field['field_name']]);
           }
         }
@@ -237,7 +237,7 @@ function conditional_fields_nodeapi(&$no
             if ($controlled_group) {
               unset($node->content[$controlled_group]['group'][$field['field_name']]);
             }
-            else {
+            else {
               unset($node->content[$field['field_name']]);
             }
           case C_FIELDS_ORPHANED_SHOW_ALL:
@@ -705,7 +705,7 @@ function conditional_fields_node_editing
       }
       else {
         // Do not submit values of controlled fields which were not triggered (except on preview)
-        if (!in_array('node_form_build_preview', $form_state['submit_handlers'])) {
+        if ((!in_array('node_form_build_preview', $form_state['submit_handlers'])) && (is_array($form['#field_info'][$row['field_name']]['widget']['default_value']))) {
           foreach ($form['#field_info'][$row['field_name']]['widget']['default_value'] as $delta => $value) {
             $form_state['values'][$row['field_name']][$delta]['value'] = $value['value'];
           }