Index: content_crud.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/content_crud.inc,v
retrieving revision 1.4.2.11
diff -u -u -p -r1.4.2.11 content_crud.inc
--- content_crud.inc	26 Jan 2007 12:34:56 -0000	1.4.2.11
+++ content_crud.inc	5 Oct 2007 18:34:10 -0000
@@ -177,6 +177,7 @@ function content_field_delete($propertie
   foreach ($type_names as $type_name) {
     content_field_instance_delete(array('type_name' => $type_name, 'field_name' => $properties['field_name']));
   }
+  content_clear_type_cache();
   return (count($type_names) ? 1 : 0);
 }
 
@@ -236,6 +237,7 @@ function content_field_instance_delete($
 
   $type = content_types($properties['type_name']);
   $field = $type['fields'][$properties['field_name']];
+  $db_info = content_database_info($field);
   $field_types = _content_field_types();
   $field_type = $field_types[$field['type']];
   $columns = module_invoke($field_type['module'], 'field_settings', 'database columns', $field);
@@ -253,6 +255,10 @@ function content_field_instance_delete($
         db_query("UPDATE {node_field} SET db_storage = %d WHERE field_name = '%s'", CONTENT_DB_STORAGE_PER_CONTENT_TYPE, $properties['field_name']);
         content_alter_db_field($field, $columns, $new_field, $columns);
       }
+      if (substr($db_info['table'], 0, 13) == 'content_field' && db_table_exists($db_info['table'])) {
+        db_query('DROP TABLE {'. $db_info['table'] .'}');
+        drupal_set_message(t('The content field table %name has been deleted.', array('%name' => $db_info['table'])));
+      }
     }
   }
 
@@ -262,9 +268,11 @@ function content_field_instance_delete($
       content_alter_db_field($field, $columns, array(), array());
     }
     db_query("DELETE FROM {node_field} WHERE field_name = '%s'", $properties['field_name']);
+    if (substr($db_info['table'], 0, 13) == 'content_field' && db_table_exists($db_info['table'])) {
+      db_query('DROP TABLE {'. $db_info['table'] .'}');
+      drupal_set_message(t('The content field table %name has been deleted.', array('%name' => $db_info['table'])));
+    }
   }
 
-  content_clear_type_cache();
-
   return $number_deleted;
 }