From b83352ff4a1b96f4e01041aa5b329d6594b5f51d Mon Sep 17 00:00:00 2001
From: Chris Leppanen <chris.leppanen@gmail.com>
Date: Tue, 14 May 2013 17:03:28 -0700
Subject: [PATCH] Fix validation for importing importers.
---
feeds_ui/feeds_ui.admin.inc | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/feeds_ui/feeds_ui.admin.inc b/feeds_ui/feeds_ui.admin.inc
index fb63c8cc..5bfc231e 100644
--- a/feeds_ui/feeds_ui.admin.inc
+++ b/feeds_ui/feeds_ui.admin.inc
@@ -1148,9 +1148,12 @@ function feeds_ui_importer_import_validate($form, &$form_state) {
'%api_version' => feeds_api_version())));
}
- $existing = feeds_importer($feeds_importer->id);
- if ($existing && !$form_state['values']['id_override'] && $existing->export_type != EXPORT_IN_CODE) {
- return form_error($form['id'], t('Feeds importer already exists with that id.'));
+ $exists = feeds_ui_importer_machine_name_exists($feeds_importer->id);
+
+ if ($exists && !$form_state['values']['id_override']) {
+ if (feeds_importer($feeds_importer->id)->export_type != EXPORT_IN_CODE) {
+ return form_error($form['id'], t('Feeds importer already exists with that id.'));
+ }
}
if (!$form_state['values']['bypass_validation']) {
--
GitLab