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	5 Jun 2009 07:38:05 -0000
@@ -338,7 +338,7 @@ function conditional_fields_content_admi
       }
     }
     // - AND with Allowed values
-    if (!$allowed_values[$field['field_name']] = content_allowed_values($field)) {
+    if (!$allowed_values[$field['field_name']] = conditional_field_allowed_values($field)) {
       continue;
     }
     $available_fields[$field['field_name']] = $field;
@@ -382,7 +382,7 @@ function conditional_fields_fieldgroup_g
   foreach ($form['#content_type']['fields'] as $field) {
     $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)) {
+      if ($allowed_values[$field['field_name']] = conditional_field_allowed_values($field)) {
         $available_fields[$field['field_name']] = $field;
       }
     }
@@ -1143,3 +1143,14 @@ function conditional_fields_form_clean_i
   $id = str_replace(array('][', '_', ' '), '-', $id);
   return $id;
 }
+
+function conditional_field_allowed_values($field) {
+  if($field['type'] == 'content_taxonomy') {
+    $field_allowed_values = content_taxonomy_allowed_values($field);
+    unset($field_allowed_values['']);
+  }
+  else {
+    $field_allowed_values = content_allowed_values($field);
+  }
+  return $field_allowed_values;
+}