Index: link.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/link/link.module,v
retrieving revision 1.25.2.14
diff -u -p -r1.25.2.14 link.module
--- link.module	7 Feb 2011 06:39:47 -0000	1.25.2.14
+++ link.module	17 Feb 2011 18:29:28 -0000
@@ -52,7 +52,7 @@ function link_field_info() {
         ),
       ),
       'default_widget' => 'link_field',
-      'default_formatter' => 'default',
+      'default_formatter' => 'link_default',
     ),
   );
 }
@@ -593,32 +593,32 @@ function link_field_process($element, $f
  */
 function link_field_formatter_info() {
   return array(
-    'default' => array(
+    'link_default' => array(
       'label' => t('Title, as link (default)'),
       'field types' => array('link_field'),
       'multiple values' => FIELD_BEHAVIOR_DEFAULT,
     ),
-    'url' => array(
+    'link_url' => array(
       'label' => t('URL, as link'),
       'field types' => array('link_field'),
       'multiple values' => FIELD_BEHAVIOR_DEFAULT,
     ),
-    'plain' => array(
+    'link_plain' => array(
       'label' => t('URL, as plain text'),
       'field types' => array('link_field'),
       'multiple values' => FIELD_BEHAVIOR_DEFAULT,
     ),
-    'short' => array(
+    'link_short' => array(
       'label' => t('Short, as link with title "Link"'),
       'field types' => array('link_field'),
       'multiple values' => FIELD_BEHAVIOR_DEFAULT,
     ),
-    'label' => array(
+    'link_label' => array(
       'label' => t('Label, as link with label as title'),
       'field types' => array('link_field'),
       'multiple values' => FIELD_BEHAVIOR_DEFAULT,
     ),
-    'separate' => array(
+    'link_separate' => array(
       'label' => t('Separate title and URL'),
       'field types' => array('link_field'),
       'multiple values' => FIELD_BEHAVIOR_DEFAULT,
@@ -631,9 +631,10 @@ function link_field_formatter_info() {
  */
 function link_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $elements = array();
+  $formatter = str_replace('link_', '', $display['type']);
   foreach ($items as $delta => $item) {
     $elements[$delta] = array(
-      '#markup' => theme('link_formatter_'. $display['type'], array('element' => $item, 'field' => $instance)),
+      '#markup' => theme('link_formatter_'. $formatter, array('element' => $item, 'field' => $instance)),
     );
   }
   return $elements;