Index: comment_cck.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/comment_cck/comment_cck.module,v
retrieving revision 1.11
diff -u -p -r1.11 comment_cck.module
--- comment_cck.module	14 Jul 2008 20:30:44 -0000	1.11
+++ comment_cck.module	14 Aug 2008 19:00:22 -0000
@@ -55,7 +55,7 @@ function comment_cck_form_alter(&$form, 
     }
     return;
   }
-  if ($form_id == '_content_admin_field') {
+  if ($form_id == '_content_admin_field' && $form_state['post']['op'] != 'Change basic information' && $form_state['values']['op'] != 'Change basic information') {
     $form['field']['comment_cck_node'] = array(
       '#type' => 'value',
       '#value' => $form['type_name']['#value'],
@@ -87,13 +87,13 @@ function _comment_cck_submit($form, &$fo
     // Get the fields
     $fields = variable_get('comment_cck_fields_'. $form_state['values']['comment_cck_node'], array());
     // Unset the field
-    unset($fields[$form_state['field_name']]);
+    unset($fields[$form_state['values']['field_name']]);
     // And set it back again
-    variable_set('comment_cck_fields_'. $form_state['type_name'], $fields);
+    variable_set('comment_cck_fields_'. $form_state['values']['type_name'], $fields);
     // Check if there are any fields left
     if (empty($fields)) {
       // Make this false so that it doesn't try to add a form
-      variable_set('comment_cck_node_'. $form_state['type_name'], FALSE);
+      variable_set('comment_cck_node_'. $form_state['values']['type_name'], FALSE);
     }
   }
   return;
@@ -239,4 +239,4 @@ function _comment_cck_rendering($set = N
     $rendering = $set;
   }
   return $rendering;
-}
\ No newline at end of file
+}