diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 278711940f30ae20315a2209d12d37e7f1071526..1d04978dfa896e9b8995c0db660042589c3a9617 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,11 @@ // $Id$ +Feeds 6.x 1.0 Alpha 14, 2010-04-11 +---------------------------------- + +- #758664: Fix regression introduced with #740962. + Feeds 6.x 1.0 Alpha 13, 2010-03-30 ---------------------------------- diff --git a/feeds.module b/feeds.module index 3d91cad2293b7550c632ff4ed9b921800409d14c..2c89ddb9dcbd196e02349427da6520cd9a41696b 100644 --- a/feeds.module +++ b/feeds.module @@ -292,6 +292,10 @@ function feeds_nodeapi(&$node, $op, $form) { break; case 'insert': case 'update': + // A node may not have been validated, make sure $node_feeds is present. + if (empty($node_feeds)) { + $node_feeds = $node->feeds; + } // Add configuration to feed source and save. $source = feeds_source($importer_id, $node->nid); $source->addConfig($node_feeds); @@ -307,7 +311,7 @@ function feeds_nodeapi(&$node, $op, $form) { // Add expiry to schedule, in case this is the first feed of this // configuration. feeds_scheduler()->add($importer_id, 'expire'); - unset($node_feeds); + $node_feeds = NULL; break; case 'delete': // Remove feed from scheduler and delete source.