Index: content.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/content.module,v
retrieving revision 1.90.2.36
diff -u -r1.90.2.36 content.module
--- content.module	29 Jan 2007 16:03:43 -0000	1.90.2.36
+++ content.module	25 Feb 2007 12:38:32 -0000
@@ -12,6 +12,8 @@
 define('CONTENT_CALLBACK_NONE', 0x0001);
 define('CONTENT_CALLBACK_DEFAULT', 0x0002);
 define('CONTENT_CALLBACK_CUSTOM', 0x0004);
+define('CONTENT_CALLBACK_SINGLE_VALUE', 0x0005);
+define('CONTENT_CALLBACK_ALL_VALUES', '0x0006');
 
 function content_help($section) {
   if (preg_match('!^admin/content/types/.*/display$!', $section)) {
@@ -576,8 +578,13 @@
           }
         }
         else {
-          foreach ($node_field as $delta => $item) {
-            $node_field[$delta]['view'] = content_format($field, $item, $formatter, $node);
+          if ($field_types[$field['type']]['formatters'][$formatter]['values'] == CONTENT_CALLBACK_ALL_VALUES) {
+          	$node_field = array(0 => array('view' => content_format($field, $node_field, $formatter, $node)));
+          }
+          else {
+            foreach ($node_field as $delta => $item) {
+              $node_field[$delta]['view'] = content_format($field, $item, $formatter, $node);
+            }
           }
           $value = theme('field', $node, $field, $node_field, $teaser, $page);
         }
@@ -1037,7 +1044,7 @@
  *
  *  @param $field
  *    The field array, including widget info.
- 
+
  * @return
  *    CONTENT_CALLBACK_NONE    - do nothing for this operation
  *    CONTENT_CALLBACK_CUSTOM  - use the module's callback function.
@@ -1048,7 +1055,7 @@
   $entity_types = ($entity == 'field') ? _content_field_types() : _content_widget_types();
   $entity_type = ($entity == 'field') ? $field['type'] : $field['widget']['type'];
   $module = $entity_types[$entity_type]['module'];
-  
+
   if ($op == 'default value' && $module == 'computed_field') {
     $callback_value =   CONTENT_CALLBACK_NONE;
   }