Skip to content
Snippets Groups Projects
Commit 5a6f56dc authored by Alex Barth's avatar Alex Barth
Browse files

#906654 alex_b: Fix phantom subscriptions.

parent 5959bcb0
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
Feeds 6.x xxxxxxxxxxxxxxxxxxxxxx Feeds 6.x xxxxxxxxxxxxxxxxxxxxxx
-------------------------------- --------------------------------
- #906654 alex_b: Fix phantom subscriptions.
- #867892 alex_b: PubSubHubbub - slow down import frequency of feeds that are - #867892 alex_b: PubSubHubbub - slow down import frequency of feeds that are
subscribed to hub. subscribed to hub.
- #908964 alex_b: Break out scheduler. Note: Features depends on Job Scheduler - #908964 alex_b: Break out scheduler. Note: Features depends on Job Scheduler
......
...@@ -287,13 +287,20 @@ class FeedsSource extends FeedsConfigurable { ...@@ -287,13 +287,20 @@ class FeedsSource extends FeedsConfigurable {
} }
/** /**
* Override existing, only return source if importer and source 'exist'. * Only return source if configuration is persistent and valid.
* *
* @see FeedsConfigurable::existing(). * @see FeedsConfigurable::existing().
*/ */
public function existing() { public function existing() {
$this->importer->existing(); // If there is no feed nid given, there must be no content type specified.
return parent::existing(); // 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();
}
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment