From 13b6962eb0d6f5a0ba38bcf0cfa0dda889b93c0f Mon Sep 17 00:00:00 2001
From: Alex Barth <alex_b@53995.no-reply.drupal.org>
Date: Tue, 31 Aug 2010 00:45:54 +0000
Subject: [PATCH] #885724 eliotttf: Avoid array_flip() on non scalars.
---
CHANGELOG.txt | 1 +
feeds.module | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c5570248..d1e4242c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@
Feeds 6.x 1.0 XXXXXXXXXXXXXXXXXX
--------------------------------
+- #885724 eliotttf: Avoid array_flip() on non scalars.
- #885052 Hanno: Fix small typo in access rights.
- #863494 ekes, alex_b: Delete temporary enclosures file.
- #849986 lyricnz, alex_b: Cleaner batch support.
diff --git a/feeds.module b/feeds.module
index 7292080f..386d221c 100644
--- a/feeds.module
+++ b/feeds.module
@@ -513,7 +513,7 @@ function _feeds_importer_digest() {
else {
$importers = array();
foreach (feeds_importer_load_all() as $importer) {
- $importers[$importer->id] = $importer->config['content_type'];
+ $importers[$importer->id] = isset($importer->config['content_type']) ? $importer->config['content_type'] : '';
}
cache_set(__FUNCTION__, $importers);
}
--
GitLab