Index: includes/uuid_node.features.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uuid_features/includes/uuid_node.features.inc,v
retrieving revision 1.1
diff -u -p -r1.1 uuid_node.features.inc
--- includes/uuid_node.features.inc	26 Jul 2010 22:16:15 -0000	1.1
+++ includes/uuid_node.features.inc	23 Sep 2010 21:16:17 -0000
@@ -68,23 +68,18 @@ function uuid_node_features_export_rende
   foreach ($data as $uuid) {
     $node = node_get_by_uuid($uuid);
 
-    $export = new stdClass();
-    $props = array('uuid', 'type', 'language', 'status', 'comment', 'promote', 'moderate', 'sticky',
-      'title', 'body', 'format', 'name', 'path', 'revision');
-    foreach ($props as $key) {
-      if (isset($node->$key)) {
-        $export->$key = $node->$key;
-      }
-    }
-
     // Use date instead of created, in the same format used by node_object_prepare.
-    $export->date = format_date($node->created, 'custom', 'Y-m-d H:i:s O');
+    $node->date = format_date($node->created, 'custom', 'Y-m-d H:i:s O');
+    
+    // Don't cause conflicts with the legacy nid/vid fields.
+    unset($node->nid);
+    unset($node->vid);
 
     // The hook_alter signature is:
     // hook_uuid_node_features_export_render_alter(&$export, &$node, $module);
-    drupal_alter('uuid_node_features_export_render', $export, $node, $module);
+    drupal_alter('uuid_node_features_export_render', $node, $module);
 
-    $code[] = '  $nodes[] = '. features_var_export($export, '  ') .';';
+    $code[] = '  $nodes[] = '. features_var_export($node, '  ') .';';
   }
 
   if (!empty($translatables)) {