? 472446.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:42:04 -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:
@@ -272,9 +272,6 @@ function conditional_fields_form_alter(&
     case 'fieldgroup_remove_group':
       $form['#submit'][] = 'conditional_fields_fieldgroup_remove_group_submit';
       break;
-    case $form['type']['#value'] . '_node_form':
-      conditional_fields_node_editing_form($form, $form_state);
-      break;
     case 'content_add_more_js':
       // Handle ahah multiple fields
       $key = array_keys($form);
@@ -290,6 +287,9 @@ function conditional_fields_form_alter(&
       $form['#submit'][] = 'conditional_fields_import';
       break;
   }
+	if((isset($form['type']['#value'])) && $form_id == $form['type']['#value'] . '_node_form'){
+		conditional_fields_node_editing_form($form, $form_state);
+	}
 }
  
 /**