? 867892-7_slow_push.patch
? 867892-8_slow_push.patch
? 906654-3_fix_phantom_subscriptions.patch
? libraries/simplepie.inc
Index: includes/FeedsSource.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/includes/FeedsSource.inc,v
retrieving revision 1.20
diff -u -p -r1.20 FeedsSource.inc
--- includes/FeedsSource.inc	15 Sep 2010 19:40:56 -0000	1.20
+++ includes/FeedsSource.inc	15 Sep 2010 19:47:14 -0000
@@ -287,13 +287,20 @@ class FeedsSource extends FeedsConfigura
   }
 
   /**
-   * Override existing, only return source if importer and source 'exist'.
+   * Only return source if configuration is persistent and valid.
    *
    * @see FeedsConfigurable::existing().
    */
   public function existing() {
-    $this->importer->existing();
-    return parent::existing();
+    // If there is no feed nid given, there must be no content type specified.
+    // If there is a feed nid given, there must be a content type specified.
+    // Ensure that importer is persistent (= defined in code or DB).
+    // Ensure that source is persistent (= defined in DB).
+    if ((empty($this->feed_nid) && empty($this->importer->config['content_type'])) ||
+        (!empty($this->feed_nid) && !empty($this->importer->config['content_type']))) {
+      $this->importer->existing();
+      return parent::existing();
+    }
   }
 
   /**