Index: content.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/content.module,v
retrieving revision 1.78
diff -u -Ff -r1.78 content.module
--- content.module	19 Sep 2006 00:36:52 -0000	1.78
+++ content.module	6 Oct 2006 12:26:48 -0000
@@ -515,25 +515,25 @@   $field_types = _content_field_types();
 
   $return = array();
   foreach ($type['fields'] as $field) {
-    $node_field = isset($node->$field['field_name']) ? $node->$field['field_name'] : array();
-
-    $module = $field_types[$field['type']]['module'];
-    $function = $module .'_field';
-    if (function_exists($function)) {
-      $result = $function($op, $node, $field, $node_field, $teaser, $page);
-      if (is_array($result)) {
-        $return = array_merge($return, $result);
+    if (isset($node->$field['field_name'])) {
+      $node_field = $node->$field['field_name'];
+      $module = $field_types[$field['type']]['module'];
+      $function = $module .'_field';
+      if (function_exists($function)) {
+        $result = $function($op, $node, $field, $node_field, $teaser, $page);
+        if (is_array($result)) {
+          $return = array_merge($return, $result);
+        }
+        else if (isset($result)) {
+          $return[] = $result;
+        }
       }
-      else if (isset($result)) {
-        $return[] = $result;
+  
+      if (isset($node->$field['field_name'])) {
+        $node->$field['field_name'] = $node_field;
       }
     }
-
-    if (isset($node->$field['field_name'])) {
-      $node->$field['field_name'] = $node_field;
-    }
   }
-
   return $return;
 }