Index: content_panels.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/Attic/content_panels.inc,v
retrieving revision 1.1.2.14
diff -u -p -r1.1.2.14 content_panels.inc
--- content_panels.inc	29 Apr 2008 09:43:30 -0000	1.1.2.14
+++ content_panels.inc	11 May 2008 20:18:25 -0000
@@ -123,7 +123,7 @@ function content_panels_render_field($co
   }
   else {
     foreach ($node_field as $delta => $item) {
-      $node_field[$delta]['view'] = content_format($field, $item, $conf['formatter'], $node);
+      $node_field[$delta]['view'] = content_format($field, $item, $formatter, $node);
     }
     $value = theme('field', $node, $field, $node_field, 0, 0);
   }