Index: cck_field_privacy.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck_field_privacy/cck_field_privacy.module,v
retrieving revision 1.4
diff -u -r1.4 cck_field_privacy.module
--- cck_field_privacy.module	12 Mar 2008 23:04:23 -0000	1.4
+++ cck_field_privacy.module	26 Mar 2008 15:38:34 -0000
@@ -121,11 +121,11 @@
     $cckfp_enabled_fields = array();
 
     // Figure out what node type (via name) we are accessing.
-    $node_name_array = explode('_', $form_id);
-    if (array_key_exists($node_name_array[0], $fields)) {
-      if ($fields[$node_name_array[0]] != '0') {
+    $node_type = $form['#node']->type;
+    if (array_key_exists($node_type, $fields)) {
+      if ($fields[$node_type] != '0') {
         foreach ($values as $name => $value) {
-          if ($name == $node_name_array[0]) {
+          if ($name == $node_type) {
             foreach ($value as $field => $enabled) {
               if (!$enabled) continue;
               if (array_key_exists($field, $form)) {
@@ -140,7 +140,7 @@
                 }
 
                 // Get the current state of the field
-                $field_pref_sql = db_query("SELECT permission FROM {cckfp} WHERE uid = %d AND type_name = '%s' AND field_name = '%s'", $uid, $node_name_array[0], $field);
+                $field_pref_sql = db_query("SELECT permission FROM {cckfp} WHERE uid = %d AND type_name = '%s' AND field_name = '%s'", $uid, $node_type, $field);
                 $field_pref = (string) db_result($field_pref_sql);
 
                 // Let's add the field name to the array of fields