? conditional_fields_issue_585280.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.44
diff -u -p -r1.1.2.22.2.44 conditional_fields.module
--- conditional_fields.module	15 Aug 2009 22:41:08 -0000	1.1.2.22.2.44
+++ conditional_fields.module	27 Oct 2009 22:15:25 -0000
@@ -205,28 +205,17 @@ function conditional_fields_nodeapi(&$no
 
       // We might have to look for the field in a group
       $controlled_group = conditional_fields_get_group($node->type, $field['field_name']);
-      $controlling_group = conditional_fields_get_group($node->type, $field['control_field_name']);
 
       // The controlled field is not in a group and is not in the form for other reasons. Skip.
       if (!$controlled_group && !$node->content[$field['field_name']]) {
         continue;
       }
 
-      // The controlling field is not in a group and is not the form for other reasons. Skip.
-      if (!$controlling_group && !$node->content[$field['control_field_name']]) {
-        continue;
-      }
-
-      // The controlled field is in a group and is not the form for other reasons. Skip.
+      // The controlled field is in a group and is not in the form for other reasons. Skip.
       if ($controlled_group && !$node->content[$controlled_group]['group'][$field['field_name']]) {
         continue;
       }
 
-      // The controlling field is in a group and is not the form for other reasons. Skip.
-      if ($controlling_group && !$node->content[$controlling_group]['group'][$field['control_field_name']]) {
-        continue;
-      }
-
       $viewed = FALSE;
       $current_values[$field['control_field_name']] = array();