Index: civinode.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/civinode/civinode.module,v
retrieving revision 1.21.2.4
diff -u -r1.21.2.4 civinode.module
--- civinode.module	2 Feb 2007 22:29:34 -0000	1.21.2.4
+++ civinode.module	19 Feb 2007 19:02:28 -0000
@@ -300,7 +300,7 @@
     return ""; //nothing to display.
 
   //Pull data for our cid
-  $contact = (object)civinode_util_load_cdata($cid, $pid);
+  $contact = (object)civinode_util_load_cdata($cid, $pid, TRUE);
   if (isset($contact->display_name))
     $contact->title = $contact->display_name;
 
Index: civinode_utils.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/civinode/civinode_utils.inc,v
retrieving revision 1.23.2.4
diff -u -r1.23.2.4 civinode_utils.inc
--- civinode_utils.inc	17 Feb 2007 01:16:41 -0000	1.23.2.4
+++ civinode_utils.inc	19 Feb 2007 19:04:08 -0000
@@ -388,9 +388,10 @@
  * @ingroup CiviCRM_MetaData
  * @param int $cid CRM Contact ID
  * @param int $pid CRM Profile ID
+ * @param bool $specify_return_properties Whether to specify the return properties by profile.
  * @return array assoc. array of contact data
  */
-function civinode_util_load_cdata($cid, $pid = 0){
+function civinode_util_load_cdata($cid, $pid = 0, $specify_return_properties = FALSE){
   //TO DO: This code is 1.4 dependent. If we back port,
   //we will need to add some search code
   if (!civinode_check_init()){
@@ -398,14 +399,20 @@
     return NULL;
   }
   $params = array('contact_id' => $cid);
-  $keys = civinode_get_profile_field_list($pid, 'view');
-  foreach ($keys as $key => $full_key) {
-    $return_items[$key] = 1;
+  if ($specify_return_properties) {
+    $return_properties = array();
+    $keys = civinode_get_profile_field_list($pid, 'view');
+    foreach (array_keys($keys) as $key) {
+      $return_properties[$key] = 1;
+    }
+  }
+  else {
+    $return_properties = NULL;
   }
   //TO DO: add profile filter
-  $data = crm_fetch_contact($params);
+  $data = crm_fetch_contact($params, $return_properties);
 /*  //Work around for CRM-822
-  $contacts = crm_contact_search($params);
+  $contacts = crm_contact_search($params, $return_properties);
   //this is also counter to spec:
   if(!isset($contacts[0][$cid]))
     return array();
@@ -631,7 +638,6 @@
   return array_keys($group_list);
 }
 
-
 /**
  * Determines if a CRM group contains a contact.
  *