? content_profile-939978.patch
Index: modules/content_profile_tokens.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/content_profile/modules/Attic/content_profile_tokens.module,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 content_profile_tokens.module
--- modules/content_profile_tokens.module	3 Nov 2009 14:20:17 -0000	1.1.2.1
+++ modules/content_profile_tokens.module	13 Oct 2010 03:22:25 -0000
@@ -26,7 +26,7 @@ function content_profile_tokens_token_va
         }
         $fields = content_types($type_name);
         foreach ($fields['fields'] as $field_name => $field) {
-          if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
+          if (isset($profile->{$field_name}[0]['value']) && !$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
               $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
               $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
           }
@@ -39,13 +39,13 @@ function content_profile_tokens_token_va
         foreach($types as $type_name => $type) {
           $profile_requestor = content_profile_load($type_name, $object->friend->uid);
           $profile_requestee = content_profile_load($type_name, $object->uid);
-          
+
           $fields = content_types($type_name);
           foreach ($fields['fields'] as $field_name => $field) {
             if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
               $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
               $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
-              
+
               $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
               $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
             }
@@ -65,7 +65,7 @@ function content_profile_tokens_token_li
   if ($type == 'user' || $type == 'all') {
     $types = content_profile_get_types('types');
     foreach ($types as $type_name => $type) {
-    
+
       $fields = content_types($type_name);
       foreach ($fields['fields'] as $field_name => $field) {
         if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
@@ -75,7 +75,7 @@ function content_profile_tokens_token_li
       }
     }
   }
-  
+
   if ($type == 'flag_friend' && module_exists('flag_friend')) {
     foreach($types as $type_name => $type) {
       $fields = content_types($type_name);