Index: sf_node/sf_node.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/salesforce/sf_node/sf_node.module,v
retrieving revision 1.2.2.12
diff -u -p -r1.2.2.12 sf_node.module
--- sf_node/sf_node.module	31 Aug 2009 15:00:22 -0000	1.2.2.12
+++ sf_node/sf_node.module	11 Nov 2009 18:48:47 -0000
@@ -465,16 +465,13 @@ function sf_node_export($node, $fieldmap
   // Load the fieldmap so we can get the object name.
   $map = salesforce_api_fieldmap_load($fieldmap);
 
-  if (empty($sfid)) {
-    // Export the object to Salesforce.
-    $response = $sf->client->create(array($object), $map['salesforce']);
-  }
-  else {
+  if (!empty($sfid)) {
     $object->Id = $sfid;
-
-    $response = $sf->client->update(array($object), $map['salesforce']);
   }
 
+  // Export the object to Salesforce.
+  $response = $sf->client->upsert('Id', array($object));
+
   // If the export was successful...
   if ($response->success) {
     if (empty($sfid)) {
Index: sf_user/sf_user.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/salesforce/sf_user/sf_user.module,v
retrieving revision 1.2.2.6
diff -u -p -r1.2.2.6 sf_user.module
--- sf_user/sf_user.module	31 Aug 2009 15:00:22 -0000	1.2.2.6
+++ sf_user/sf_user.module	11 Nov 2009 18:48:47 -0000
@@ -341,16 +341,13 @@ function sf_user_export($uid, $fieldmap,
   // Load the fieldmap so we can get the object name.
   $map = salesforce_api_fieldmap_load($fieldmap);
 
-  if (empty($sfid)) {
-    // Export the object to Salesforce.
-    $response = $sf->client->create(array($object), $map['salesforce']);
-  }
-  else {
+  if (!empty($sfid)) {
     $object->Id = $sfid;
-
-    $response = $sf->client->update(array($object), $map['salesforce']);
   }
 
+  // Export the object to Salesforce.
+  $response = $sf->client->upsert('Id', array($object));
+
   // If the export was successful...
   if ($response->success) {
     if (empty($sfid)) {