Index: cck_blocks.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/cck_blocks/cck_blocks.module,v
retrieving revision 1.3
diff -u -r1.3 cck_blocks.module
--- cck_blocks.module	13 Mar 2008 16:13:30 -0000	1.3
+++ cck_blocks.module	17 Feb 2009 00:11:21 -0000
@@ -49,16 +49,13 @@
 	
 		if (arg(0) == 'node' && is_numeric(arg(1)) && !arg(2) && $fields[$delta]) {
 			$node = node_load(arg(1));
-
-			if ($items = $node->$delta) {
-				$block['subject'] = $fields[$delta]['widget']['label'] ? $fields[$delta]['widget']['label'] : $delta;
-				$block['content'] = '';
-				
-				$settings = variable_get('cck_blocks_' . $delta, array('formatter' => 'default'));				
-				foreach ($items as $item) {
-					$block['content'] .= module_invoke('content', 'format', $fields[$delta], $item, $settings['formatter'], $node);
-				}
-			}
+      $node->NODE_BUILD_NORMAL;
+      
+      $settings = variable_get('cck_blocks_' . $delta, array('formatter' => 'default'));
+      $fields[$delta]['display_settings']['teaser']['format'] = $settings['formatter'];
+      $fields[$delta]['display_settings']['full']['format'] = $settings['formatter'];
+      $block['subject'] = $fields[$delta]['widget']['label'] ? $fields[$delta]['widget']['label'] : $delta;
+      $block['content'] = content_view_field($fields[$delta], $node);
 		}
 
 		return $block;