--- content_profile.inc~	2009-10-24 16:10:47.000000000 -0500
+++ content_profile.inc	2011-03-14 20:00:20.465486930 -0500
@@ -87,7 +87,6 @@
    *  callback to create or update a node if appropriate
    */
   function content_profile_user_import_node($type, $content_profile, $account, $fields, $updated, $update_setting) {
-  
     if (empty($content_profile[$type])) return;  // pass only those, which are used
  
     $errors = array();      
@@ -106,29 +105,27 @@
 
     // Assign the mapped fields to the $node.    
     foreach ($content_profile[$type] as $column_id => $column_data) {
-	
     	$field_data = explode(':', $column_id);
     	$field_name = !empty($field_data[1]) ? $field_data[1] : $column_id; 
-      $field_key = !empty($field_data[2]) ? $field_data[2] : 'value';
-      $field_value = array(0 => array($field_key => $column_data[0]));
+        $field_key = !empty($field_data[2]) ? $field_data[2] : 'value';
+        $field_value = array(0 => array($field_key => $column_data[0]));
 
-      if (!$updated) {
-        $node->{$field_name} = $field_value;
-      }
-      elseif ($updated && $update_setting == UPDATE_ADD) {
-
-        $current_content = content_format($field_name, $node->{$field_name}[0], 'default', $node);
-
-        if (empty($current_content) && !empty($column_data[0])) { 
-					$node->{$field_name} = $field_value;
-        }
-      }
-      elseif ($updated && $update_setting == UPDATE_REPLACE) {
-        $node->{$field_name} = $field_value; 
-      }  
+        if (!$updated) {
+            // kjh: added the array indexes for multipart fields
+            $node->{$field_name}[0][$field_key] = $field_value[0][$field_key];
+        } elseif ($updated && $update_setting == UPDATE_ADD) {
+            $current_content = content_format($field_name, $node->{$field_name}[0], 'default', $node);
+
+            if (empty($current_content) && !empty($column_data[0])) { 
+                $node->{$field_name} = $field_value;
+            }
+        } elseif ($updated && $update_setting == UPDATE_REPLACE) {
+            // kjh: added the array indexes for multipart fields
+            $node->{$field_name}[0][$field_key] = $field_value[0][$field_key]; 
+        }  
     }
-    
-		// not actually checking for errors at the moment, but lete's leave this in for when we do
+
+    // not actually checking for errors at the moment, but let's leave this in for when we do
     if (empty($errors)) {
       $node->uid = $account->uid;
       $node->name = $account->name;