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.8
diff -u -r1.1.2.18.2.8 feedapi_node.module
--- feedapi_node/feedapi_node.module	11 Apr 2008 19:42:51 -0000	1.1.2.18.2.8
+++ feedapi_node/feedapi_node.module	21 Apr 2008 17:28:03 -0000
@@ -106,7 +106,9 @@
  * to return different forms for parsers and processors.
  * There might be a better term for parsers and processors than $type.
  */
-function feedapi_node_feedapi_settings_form($type) { 
+function feedapi_node_feedapi_settings_form($type) {
+  $form = array();
+  
   switch ($type) {
     case 'processors':
       $ct_types = node_get_types();
Index: feedapi_node/feedapi_node.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi_node/Attic/feedapi_node.install,v
retrieving revision 1.1.2.13.2.2
diff -u -r1.1.2.13.2.2 feedapi_node.install
--- feedapi_node/feedapi_node.install	3 Mar 2008 22:04:56 -0000	1.1.2.13.2.2
+++ feedapi_node/feedapi_node.install	21 Apr 2008 17:28:02 -0000
@@ -49,6 +49,7 @@
   drupal_install_schema('feedapi_node');
   // Creating the content-types for the FeedAPI
   $info->type = 'feedapi_node';
+  $info->orig_type = 'feedapi_node';
   $info->name = t('Feed');
   $info->description = t('Aggregates RSS or Atom feeds. Items from these feeds will be turned into nodes.');
   $info->module = 'node';
@@ -58,6 +59,8 @@
   $info->body_label = t('Body');
   $info->min_word_count = 0;
   $info->custom = TRUE;
+  $info->modified = TRUE;
+  $info->locked = FALSE;
   node_type_save($info);
   // Adding default FeedAPI settings
   $preset = unserialize('a:3:{s:7:"enabled";s:1:"1";s:12:"items_delete";s:1:"0";s:10:"processors";a:1:{s:12:"feedapi_node";a:7:{s:7:"enabled";s:1:"1";s:6:"weight";s:1:"0";s:12:"content_type";s:5:"story";s:9:"node_date";s:4:"feed";s:7:"promote";s:1:"0";s:9:"list_feed";s:1:"3";s:4:"user";s:5:"admin";}}}');
Index: feedapi.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi.module,v
retrieving revision 1.23.2.119.2.9
diff -u -r1.23.2.119.2.9 feedapi.module
--- feedapi.module	11 Apr 2008 19:42:50 -0000	1.23.2.119.2.9
+++ feedapi.module	21 Apr 2008 17:28:02 -0000
@@ -353,7 +353,7 @@
 /**
  * Implementation of hook_form_alter().
  */
-function feedapi_form_alter(&$form, &$form_state, $form_id) {
+function feedapi_form_alter(&$form, $form_state, $form_id) {
   // Content type form.
   if ($form_id == 'node_type_form' && isset($form['identity']['type'])) {
     if (!$node_type_settings = feedapi_get_settings($form['#node_type']->type)) {
@@ -471,7 +471,7 @@
   }
   
   // FeedAPI-enabled node form.
-  if ($form['type']['#value'] .'_node_form' == $form_id && feedapi_enabled($form['type']['#value'])) {
+  if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id && feedapi_enabled($form['type']['#value'])) {
     $form['#validate'][] = 'feedapi_form_autodownload';
     $form['title']['#required'] = FALSE;
     $form['title']['#description'] = t('This field will be populated with the feed title. You can override by filling in this field.');
@@ -483,13 +483,14 @@
       '#collapsed' => FALSE,
       '#tree' => TRUE,
     );
-    if ($form_state['values']['feedapi']['url']) {
+    $feedapi_url_default = '';
+    if (isset($form_state['values']) && $form_state['values']['feedapi']['url']) {
       $feedapi_url_default = $form_state['values']['feedapi_url'];
     }
-    else if ($form['#node']->feed->url) {
+    else if (isset($form['#node']->feed->url)) {
       $feedapi_url_default = $form['#node']->feed->url;
     }
-    else if ($form_state['values']['feedapi']['feedapi_url']) {
+    else if (isset($form_state['values']) && $form_state['values']['feedapi']['feedapi_url']) {
       $feedapi_url_default = $form_state['values']['feedapi']['feedapi_url'];
     }
     $form['feedapi']['feedapi_url'] = array(
@@ -516,7 +517,7 @@
       foreach (array("parsers" => "feedapi_feed", "processors" => "feedapi_item") as $type => $requirement) {
         $suitable_handlers = module_implements($requirement, TRUE);
         foreach ($suitable_handlers as $module) {
-          if ($node_type_settings[$type][$module]['enabled']) {
+          if (isset($node_type_settings[$type][$module]) && $node_type_settings[$type][$module]['enabled']) {
             $result = array();
             $result = module_invoke($module, 'feedapi_settings_form', $type);
             if (is_array($result)) {
@@ -540,7 +541,10 @@
       }
     }
     // If we are on a node form, get per node settings and populate form.
-    if (!$settings = feedapi_get_settings($form['type']['#value'], $form['#node']->nid)) {
+    if (isset($form['#node']->nid)) {
+      $settings = feedapi_get_settings($form['type']['#value'], $form['#node']->nid);
+    }
+    else {
       $settings = $node_type_settings;
     }
     $form['feedapi'] = _feedapi_populate($form['feedapi'], $settings);
Index: feedapi_inherit/feedapi_inherit.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi_inherit/Attic/feedapi_inherit.module,v
retrieving revision 1.1.2.14.2.1
diff -u -r1.1.2.14.2.1 feedapi_inherit.module
--- feedapi_inherit/feedapi_inherit.module	29 Feb 2008 16:09:47 -0000	1.1.2.14.2.1
+++ feedapi_inherit/feedapi_inherit.module	21 Apr 2008 17:28:02 -0000
@@ -28,6 +28,10 @@
  * Implementation of hook_nodeapi().
  */
 function feedapi_inherit_nodeapi(&$node, $op) {
+  if (!isset($node->feedapi_node)) {
+    return;
+  }
+  
   switch ($op) {
     case 'prepare':
       if ($node->feedapi_node->feed_nids) {
@@ -57,7 +61,9 @@
  * to return different forms for parsers and processors.
  * There might be a better term for parsers and processors than $type.
  */
-function feedapi_inherit_feedapi_settings_form($type) { 
+function feedapi_inherit_feedapi_settings_form($type) {
+  $form = array();
+  
   switch ($type) {
     case 'processors':
       if (module_exists('og')) {