Index: feedapi_node/feedapi_node.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi_node/Attic/feedapi_node.module,v
retrieving revision 1.1.2.18.2.9
diff -u -r1.1.2.18.2.9 feedapi_node.module
--- feedapi_node/feedapi_node.module	28 Apr 2008 21:38:23 -0000	1.1.2.18.2.9
+++ feedapi_node/feedapi_node.module	30 Apr 2008 17:10:12 -0000
@@ -227,34 +227,27 @@
 }
 
 /**
- * Create a node from the feed item
- * Store the relationship between the node and the feed item
+ * Create a node from a feed item.
+ * 
+ * Stores the relationship between the node and the feed item.
  */
-function _feedapi_node_save($feed_item, $feed_nid, $settings = array()) {  
-  module_load_include('inc', 'node', 'node.pages');
-  // Don't save anything if neither url nor guid given.
+function _feedapi_node_save($feed_item, $feed_nid, $settings = array()) {
+  // Don't save anything if neither URL nor GUID given.
   if (!$feed_item->options->original_url) {
     if (!$feed_item->options->guid) {
       return $feed_item;
     }
   }
-  // Construct the node object
+  
+  $feed_node = node_load($feed_nid);
+  
+  // Construct the node object.
   $node = new stdClass();
   if (isset($feed_item->nid)) {
     $node->nid = $feed_item->nid;
   }
+  
   $node->type = !empty($settings['content_type']) ? $settings['content_type'] : variable_get('feedapi_node_type', 'story');
-  // Get the default options from the cont
-  $options = variable_get('node_options_'. $node->type, FALSE);
-  if (is_array($options)) {
-    $node->status = in_array('status', $options) ? 1 : 0;
-    $node->promote = in_array('promote', $options) ? 1 : 0;
-    $node->sticky = in_array('sticky', $options) ? 1 : 0;
-  }
-  else {
-    $node->status = 1;
-  }
-  $feed_node = node_load($feed_nid);
   $node->title = $feed_item->title;
   if (empty($node->title) && !empty($feed_item->description)) {
     // Explode to words and use the first 3 words.
@@ -263,20 +256,26 @@
   }
   $node->body = $feed_item->description;
   $node->teaser = node_teaser($feed_item->description);
+  
   // Stick feed item on node so that add on modules can act on it.
   // A feed item can come in from more than one feed.
   $node->feedapi_node->feed_nids[$feed_nid] = $feed_nid;
   $node->feedapi_node->feed_item = $feed_item;
-  // For backwards compatibility - todo: move to using feedapi_node->feed_nids and feedapi_node->feed_item.
+  
+  // For backwards compatibility.
+  // @todo Move to using feedapi_node->feed_nids and feedapi_node->feed_item.
   $node->feedapi->feed_nid = $feed_nid;
   $node->feedapi->feed_item = $feed_item;
+  
+  module_load_include('inc', 'node', 'node.pages');
   node_object_prepare($node);
+  
   $node->created = (isset($settings['node_date']) && $settings['node_date'] == 'feed') ? $feed_item->options->timestamp : time();
   $node->uid = $feed_node->uid;
   
   // If there are dupes on other feeds, don't create new feed item, but link this feed
   // to existing feed item.
-  // Heads up: if there is a duplicate on the SAME feed, 
+  // Heads up: If there is a duplicate on the SAME feed,
   // _feedapi_node_save() won't even be called.
   if (isset($feed_item->feedapi_node->duplicates)) {
     foreach ($feed_item->feedapi_node->duplicates as $fi_nid => $f_nids) {
@@ -289,6 +288,7 @@
   else {
     node_save($node);
   }
+  
   return $feed_item;
 }
 
Index: feedapi.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi.module,v
retrieving revision 1.23.2.119.2.12
diff -u -r1.23.2.119.2.12 feedapi.module
--- feedapi.module	29 Apr 2008 17:11:39 -0000	1.23.2.119.2.12
+++ feedapi.module	30 Apr 2008 17:10:11 -0000
@@ -843,21 +843,20 @@
   if (!$feed->title && !$node->title) {
     return FALSE;
   }
-  module_load_include('inc', 'node', 'node.pages');
   $node->title = $node->title ? $node->title : $feed->title;
   $node->body = $node->body ? $node->body : $feed->description;
   $node->feedapi_object = $feed;
-  $node_options = variable_get('node_options_'. $node->type, array('status', 'promote'));
-  // If this is a new node, fill in the default values.
-  foreach (array('status', 'promote', 'sticky') as $key) {
-    $node->$key = in_array($key, $node_options);
-  }
-  // Get the content-type settings as default
+  
+  // Get the content type settings as default.
   $node->feedapi = feedapi_get_settings($node->type);
+  
+  module_load_include('inc', 'node', 'node.pages');
   node_object_prepare($node);
+  
   global $user;
   $node->uid = $user->uid;
   node_save($node);
+  
   return $node;
 }