From 4fbba3768a1af1927da244a829b67ecbc1181224 Mon Sep 17 00:00:00 2001
From: joelpittet <joelpittet@160302.no-reply.drupal.org>
Date: Tue, 2 Dec 2014 12:01:13 -0800
Subject: [PATCH] Issue #1887632 by joelpittet: Exception: Empty configuration
identifier.
---
feeds.module | 7 ++++---
includes/FeedsConfigurable.inc | 13 +++++++------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/feeds.module b/feeds.module
index 6ba8bfa2..c2c67222 100644
--- a/feeds.module
+++ b/feeds.module
@@ -380,9 +380,10 @@ function feeds_importer_load($id) {
try {
return feeds_importer($id)->existing();
}
- catch (FeedsNotExistingException $e) {
- return FALSE;
- }
+ catch (FeedsNotExistingException $e) {}
+ catch (InvalidArgumentException $e) {}
+
+ return FALSE;
}
/**
diff --git a/includes/FeedsConfigurable.inc b/includes/FeedsConfigurable.inc
index 2370cc41..31818bb2 100644
--- a/includes/FeedsConfigurable.inc
+++ b/includes/FeedsConfigurable.inc
@@ -44,15 +44,16 @@ abstract class FeedsConfigurable {
protected $disabled;
/**
- * Instantiate a FeedsConfigurable object.
+ * Instantiates a FeedsConfigurable object.
*
- * Don't use directly, use feeds_importer() or feeds_plugin()
- * instead.
+ * Don't use directly, use feeds_importer() or feeds_plugin() instead.
+ *
+ * @see feeds_importer()
+ * @see feeds_plugin()
*/
public static function instance($class, $id) {
- // This is useful at least as long as we're developing.
- if (empty($id)) {
- throw new Exception(t('Empty configuration identifier.'));
+ if (!strlen($id)) {
+ throw new InvalidArgumentException(t('Empty configuration identifier.'));
}
static $instances = array();
if (!isset($instances[$class][$id])) {
--
GitLab