From 12ba86a0115c5524e32522d0c4e39f10527a9832 Mon Sep 17 00:00:00 2001
From: Alex Barth <alex_b@53995.no-reply.drupal.org>
Date: Mon, 25 Oct 2010 22:16:54 +0000
Subject: [PATCH] #933306: Fix Feeds creates subscriptions for not existing
importers.
---
CHANGELOG.txt | 1 +
feeds.pages.inc | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index cac1a9a3..989c5607 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@
Feeds 7.x 2.0 XXXXXXXXXXXXXXXXXXX
---------------------------------
+- #933306 alex_b: Fix Feeds creates subscriptions for not existing importers.
- #946822 twistor: FeedsSitemapParser broken: Serialization of
'SimpleXMLElement' is not allowed.
- #949916 alex_b: Convert values mapped to user->created.
diff --git a/feeds.pages.inc b/feeds.pages.inc
index ecf8bb63..8d72d2a4 100644
--- a/feeds.pages.inc
+++ b/feeds.pages.inc
@@ -187,7 +187,10 @@ function feeds_delete_tab_form_submit($form, &$form_state) {
*/
function feeds_fetcher_callback($importer, $feed_nid = 0) {
if ($importer instanceof FeedsImporter) {
- return $importer->fetcher->request($feed_nid);
+ try {
+ return $importer->fetcher->request($feed_nid);
+ }
+ catch(Exception $e) {}
}
drupal_access_denied();
}
--
GitLab