Index: conditional_fields.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/conditional_fields/conditional_fields.module,v
retrieving revision 1.7
diff -u -p -r1.7 conditional_fields.module
--- conditional_fields.module	11 May 2009 13:27:53 -0000	1.7
+++ conditional_fields.module	25 Jun 2009 19:01:41 -0000
@@ -338,8 +338,15 @@ function conditional_fields_content_admi
       }
     }
     // - AND with Allowed values
-    if (!$allowed_values[$field['field_name']] = content_allowed_values($field)) {
-      continue;
+    if ($field['type'] == 'nodereference'){
+      if (!$allowed_values[$field['field_name']] = nodereference_allowed_values($field)) {
+        continue;
+      }
+    }
+    else {
+      if (!$allowed_values[$field['field_name']] = content_allowed_values($field)) {
+        continue;
+      }
     }
     $available_fields[$field['field_name']] = $field;
   }