--- C:/Applications/web/wamp/www/isi6/modules/conditional_fields/Copie de conditional_fields.module	Wed Dec 02 14:26:12 2009
+++ C:/Applications/web/wamp/www/isi6/modules/conditional_fields/conditional_fields.module	Thu Dec 03 10:17:49 2009
@@ -347,9 +347,11 @@
   }
 
   // Check if field is in a group
+  /* ENABLING GROUP CONTROL B Y A FIED IN ANOTHER GROUP
   if (isset($form['widget']['group'])) {
     $controlled_field_in_group = $form['widget']['group']['#value'];
   }
+  */
 
   // Get available fields, which are:
   foreach ($type['fields'] as $field) {
@@ -358,11 +360,13 @@
       continue;
     }
     // - AND fields not in a group (if this field isn't in a group), or fields in the same group.
+  /* ENABLING GROUP CONTROL B Y A FIED IN ANOTHER GROUP
     if (isset($controlled_field_in_group)) {
       if ($controlled_field_in_group != conditional_fields_get_group($field['type_name'], $field['field_name'])) {
         continue;
       }
     }
+	*/
     // - AND with Allowed values
     if (!$allowed_values[$field['field_name']] = content_allowed_values($field)) {
       continue;
@@ -475,16 +479,16 @@
 
   // Find fields with allowed values which are not inside a group
   foreach ($form['#content_type']['fields'] as $field) {
-    $in_group = fieldgroup_get_group($form['#content_type']['type'], $field['field_name']);
-    if (!$in_group) {
+    //$in_group = fieldgroup_get_group($form['#content_type']['type'], $field['field_name']);
+//    if (!$in_group) {
       if ($allowed_values[$field['field_name']] = content_allowed_values($field)) {
         $available_fields[$field['field_name']] = $field;
       }
-    }
+//    }
   }
 
   if (isset($available_fields)) {
-    conditional_fields_content_admin_field_controllable($form, $form['#content_type'], $form['group_name']['#default_value'], $available_fields, $allowed_values, $context);
+    conditional_fields_content_admin_field_controllable($form, $form['#content_type'], $form['group_name']['#default_value'], $available_fields, $allowed_values, 'group');
     // Add validation function
     $form['#validate'][] = 'conditional_fields_content_admin_field_validate';
     // Add submission function