From 0fd9d9d169a410640c36f46752a6f4eaa13de8fb Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Wed, 4 May 2016 06:51:30 +0100
Subject: [PATCH] Bug fix in the custom import option.

---
 admin/compiler/joomla_3/JControllerLegacy_import_custom.php | 2 +-
 admin/compiler/joomla_3/JModelLegacy_import_custom.php      | 2 +-
 admin/models/ajax.php                                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/compiler/joomla_3/JControllerLegacy_import_custom.php b/admin/compiler/joomla_3/JControllerLegacy_import_custom.php
index ee70998cd..c1978d7f4 100644
--- a/admin/compiler/joomla_3/JControllerLegacy_import_custom.php
+++ b/admin/compiler/joomla_3/JControllerLegacy_import_custom.php
@@ -44,7 +44,7 @@ class ###Component###Controller###View### extends JControllerLegacy
 		// Check for request forgeries
 		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
 
-		$model = $this->getModel('import');
+		$model = $this->getModel('###View###');
 		if ($model->import())
 		{
 			$cache = JFactory::getCache('mod_menu');
diff --git a/admin/compiler/joomla_3/JModelLegacy_import_custom.php b/admin/compiler/joomla_3/JModelLegacy_import_custom.php
index 3373ed786..93504ff17 100644
--- a/admin/compiler/joomla_3/JModelLegacy_import_custom.php
+++ b/admin/compiler/joomla_3/JModelLegacy_import_custom.php
@@ -49,7 +49,7 @@ class ###Component###Model###View### extends JModelLegacy
 	 *
 	 * @var        string
 	 */
-	protected $_context = 'com_###component###.import';
+	protected $_context = 'com_###component###.###view###';
 	
 	/**
 	 * Import Settings
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index 66ae979c0..5c0df6c23 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -465,7 +465,7 @@ class ComponentbuilderModelAjax extends JModelList
 			$script['view'][] = "\n<?php echo JHtml::_('bootstrap.endTabSet'); ?>";
 			$script['view'][] = "\t\t<input type=\"hidden\" name=\"gettype\" value=\"upload\" />";
 			$script['view'][] = "<?php endif; ?>";
-			$script['view'][] = "<input type=\"hidden\" name=\"task\" value=\"import.import\" />";
+			$script['view'][] = "<input type=\"hidden\" name=\"task\" value=\"import_###-#-#-views###.import\" />";
 			$script['view'][] = "<?php echo JHtml::_('form.token'); ?>";
 			$script['view'][] = "</form>";
 			$script['view'][] = "</div>";