From 9cb37de3d61b77ddab7e559f78cffa25f719f106 Mon Sep 17 00:00:00 2001
From: Alex Barth <alex_b@53995.no-reply.drupal.org>
Date: Wed, 27 Oct 2010 00:13:24 +0000
Subject: [PATCH] Don't load importer using menu loader.
---
feeds.module | 2 +-
feeds.pages.inc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/feeds.module b/feeds.module
index fa57b043..037467b2 100644
--- a/feeds.module
+++ b/feeds.module
@@ -252,7 +252,7 @@ function feeds_menu() {
'file' => 'feeds.pages.inc',
'type' => MENU_LOCAL_TASK,
);
- $items['import/%feeds_importer/template'] = array(
+ $items['import/%/template'] = array(
'page callback' => 'feeds_importer_template',
'page arguments' => array(1),
'access callback' => 'feeds_access',
diff --git a/feeds.pages.inc b/feeds.pages.inc
index a3c90e3f..15475b02 100644
--- a/feeds.pages.inc
+++ b/feeds.pages.inc
@@ -201,8 +201,8 @@ function feeds_fetcher_callback($importer, $feed_nid = 0) {
/**
* Template generation
*/
-function feeds_importer_template($importer) {
- $importer = feeds_importer_load($importer);
+function feeds_importer_template($importer_id) {
+ $importer = feeds_importer($importer_id);
if ($importer->parser instanceof FeedsCSVParser) {
return $importer->parser->getTemplate();
}
--
GitLab