--- date_tools.event.inc	2010-12-29 23:20:29.000000000 -0500
+++ New.date_tools.event.inc	2010-12-29 23:39:50.000000000 -0500
@@ -266,13 +266,16 @@ function date_tools_copy_convert_events(
 function date_tools_copy_type_form($target = TRUE) {
   $form = array();
   $node_types = node_get_types('names');
-  $fields = content_fields();
+  $content_types = content_types();
   $type_options = array();
 
   // Find out what content types contain date fields and set them up as target options.
-  foreach ($fields as $field_name => $field) {
-    if ($field['type'] == 'date' || $field['type'] == 'datestamp') {
-      $type_options[$field['type_name']] = $node_types[$field['type_name']];
+  foreach ($content_types as $content_name => $content) {
+    $fields = $content['fields'];
+	foreach ($fields as $field_name => $field) {
+		if ($field['type'] == 'date' || $field['type'] == 'datestamp') {
+			$type_options[$field['type_name']] = $node_types[$field['type_name']];
+    	}
     }
   }
 
@@ -312,7 +315,7 @@ function date_tools_copy_type_form($targ
  */
 function date_tools_copy_type_fields_form($type, $extended = FALSE) {
   $form = array();
-  $fields = content_fields();
+  $content_types = content_types();
   $date_options = array();
   $description_options = array('' => '');
   $uid_options = array('' => '');
@@ -320,19 +323,22 @@ function date_tools_copy_type_fields_for
   $location_options = array('' => '');
 
   // Find out what content types contain date fields and set them up as target options.
-  foreach ($fields as $field_name => $field) {
-    if ($field['type_name'] == $type) {
-      if ($field['type'] == 'date' || $field['type'] == 'datestamp') {
-        $date_options[$field_name] = $field['widget']['label'];
-      }
-      if ($field['type'] == 'text') {
-        $description_options[$field_name] = $field['widget']['label'];
-        $location_options[$field_name] = $field['widget']['label'];
-        $uid_options[$field_name] = $field['widget']['label'];
-        $url_options[$field_name] = $field['widget']['label'];
-      }
-      if ($field['type'] == 'link') {
-        $url_options[$field_name] = $field['widget']['label'];
+  foreach ($content_types as $content_name => $content) {
+    $fields = $content['fields'];
+    foreach ($fields as $field_name => $field) {
+      if ($field['type_name'] == $type) {
+        if ($field['type'] == 'date' || $field['type'] == 'datestamp') {
+          $date_options[$field_name] = $field['widget']['label'];
+        }
+        if ($field['type'] == 'text') {
+          $description_options[$field_name] = $field['widget']['label'];
+          $location_options[$field_name] = $field['widget']['label'];
+          $uid_options[$field_name] = $field['widget']['label'];
+          $url_options[$field_name] = $field['widget']['label'];
+        }
+        if ($field['type'] == 'link') {
+          $url_options[$field_name] = $field['widget']['label'];
+        }
       }
     }
   }