Index: email.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/email/email.module,v
retrieving revision 1.9.2.8.4.12.2.6
diff -u -p -r1.9.2.8.4.12.2.6 email.module
--- email.module	14 Oct 2010 13:03:12 -0000	1.9.2.8.4.12.2.6
+++ email.module	5 Dec 2010 03:00:39 -0000
@@ -52,22 +52,25 @@ function email_field_is_empty($item, $fi
  */
 function email_field_formatter_info() {
   $formats = array(
-    'default' => array(
+    'email_default' => array(
       'label' => t('Default email link'),
+      'description' => t('Display the email address as a mailto link.'),
       'field types' => array('email'),
     ),
-    'contact' => array(
+    'email_contact' => array(
       'label' => t('Email contact form'),
+      'description' => t('Display a contact form.'),
       'field types' => array('email'),
     ),
-    'plain' => array(
+    'email_plain' => array(
       'label' => t('Email plain text'),
+      'description' => t('Display the email address as plain text.'),
       'field types' => array('email'),
     ),
   );
   if (module_exists('spamspan')) {
     $formats += array(
-      'spamspan' => array(
+      'email_spamspan' => array(
         'label' => t('Email SpamSpan'),
         'field types' => array('email'),
       ),
@@ -82,27 +85,27 @@ function email_field_formatter_info() {
 function email_field_formatter_view($object_type, $object, $field, $instance, $langcode, $items, $display) {
   $element = array();
   switch ($display['type']) {
-    case 'default':
+    case 'email_default':
       foreach ($items as $delta => $item) {
         $output = l($item['email'], 'mailto:'. $item['email']);
         $element[$delta] = array('#markup' => $output);
       }
       break;
       
-    case 'contact':
+    case 'email_contact':
       $ids = entity_extract_ids($object_type, $object);
       foreach ($items as $delta => $item) {
         $element[$delta] = l(t('Email contact form'), 'email/'. $object_type .'/'. $ids[0] .'/'. $instance['field_name']);
       }
       break;
     
-    case 'plain':
+    case 'email_plain':
       foreach ($items as $delta => $item) {
         $element[$delta] = array('#markup' => check_plain($item['email']));
       }
       break;
     
-    case 'spamspan':
+    case 'email_spamspan':
       foreach ($items as $delta => $item) {
         if (module_exists('spamspan')) {
           $element[$delta] = spamspan($item['email']);
@@ -235,7 +238,7 @@ function email_mail_page($object_type, $
   $settings = field_info_instance($object_type, $field_name, $entity_info[2]);
   
   //verify that the contact formatter is enabled
-  if ($settings['display']['full']['type'] != 'contact' && $settings['display']['full']['teaser'] != 'contact') {
+  if (!isset($settings['display']['full']['type']) || !isset($settings['display']['full']['teaser']) || ($settings['display']['full']['type'] != 'email_contact' && $settings['display']['full']['teaser'] != 'email_contact')) {
     drupal_not_found();
     return;
   }