Index: branches/RC/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r11056 -r11057
--- branches/RC/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 11056)
+++ branches/RC/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 11057)
@@ -1025,21 +1025,29 @@
 			return $ret;
 		}
 
+		/**
+		 * Prints available and enabled import sources using given block
+		 *
+		 * @param Array $params
+		 * @return string
+		 */
 		function PrintImportSources($params)
  		{
- 			$sql = "SELECT *
- 					FROM ".TABLE_PREFIX."ImportScripts
- 					WHERE Status = 1 AND Type = 'CSV'";
- 			$rows = $this->Conn->Query($sql);
+ 			$sql = 'SELECT *
+ 					FROM ' . TABLE_PREFIX . 'ImportScripts
+ 					WHERE (Status = ' . STATUS_ACTIVE . ') AND (Type = "CSV")';
+ 			$import_sources = $this->Conn->Query($sql);
 
  			$block_params = $this->prepareTagParams($params);
  			$block_params['name'] = $params['render_as'];
 
- 			foreach ($rows as $row) {
- 				$block_params['script_id'] = $row['ImportId'];
- 				$block_params['script_module'] = $row['Module'];
- 				$block_params['script_name'] = $row['Name'];
- 				$block_params['script_prefix'] = $row['Prefix'];
+ 			$ret = '';
+ 			foreach ($import_sources as $import_source) {
+ 				$block_params['script_id'] = $import_source['ImportId'];
+ 				$block_params['script_module'] = $import_source['Module'];
+ 				$block_params['script_name'] = $import_source['Name'];
+ 				$block_params['script_prefix'] = $import_source['Prefix'];
+
  				$ret .= $this->Application->ParseBlock($block_params);
  			}
 
Index: branches/RC/core/admin_templates/tools/import2.tpl
===================================================================
diff -u -N -r11045 -r11057
--- branches/RC/core/admin_templates/tools/import2.tpl	(.../import2.tpl)	(revision 11045)
+++ branches/RC/core/admin_templates/tools/import2.tpl	(.../import2.tpl)	(revision 11057)
@@ -54,12 +54,9 @@
 				function ImportRedirect(import_id)
 				{
 					<inp2:m_DefineElement name="import_js_script">
-						<inp2:m_param name="script_prefix" result_to_var="ImportPrefix"/>
-						<inp2:m_param name="script_module" result_to_var="ImportModule"/>
-
-						if (import_id == <inp2:m_param name="script_id"/>) {
-						location.href = '<inp2:m_Link template="{$ImportModule}/import" pass="{$ImportPrefix}.import" {$ImportPrefix}.import_event="OnNew"/>';
-							return;
+						if (import_id == <inp2:m_Param name="script_id"/>) {
+							redirect('<inp2:m_Link template="{$script_module}/import" pass="{$script_prefix}.import" {$script_prefix}.import_event="OnNew"/>');
+							return ;
 						}
 					</inp2:m_DefineElement>