Index: branches/5.1.x/core/admin_templates/categories/xml/tree_categories.tpl
===================================================================
diff -u -N -r13756 -r13903
--- branches/5.1.x/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 13756)
+++ branches/5.1.x/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 13903)
@@ -3,14 +3,14 @@
 	<inp2:m_if check="Field" field="CachedDescendantCatsQty">
 		<folder
 			name="<inp2:Field name='Name'/>"
-			href="<inp2:CategoryLink template='catalog/catalog' pass='m' m_opener='r'/>"
+			href="<inp2:CategoryLink template='catalog/catalog' direct_link='1' pass='m' m_opener='r'/>"
 			icon="<inp2:c_ModulePath module='core'/>img/icons/<inp2:ItemIcon grid='Default' icon_prefix='icon24_'/>"
 			onclick="checkCatalog(<inp2:Field name='CategoryId' db="db"/>, '<inp2:GetModulePrefix/>')"
-			load_url="<inp2:CategoryLink direct_link="1" pass='m'/>">			
+			load_url="<inp2:CategoryLink direct_link="1" pass='m'/>">
 		</folder>
 	<inp2:m_else/>
 		<item
-			href="<inp2:CategoryLink template='catalog/catalog' pass='m' m_opener='r'/>"
+			href="<inp2:CategoryLink template='catalog/catalog' direct_link='1' pass='m' m_opener='r'/>"
 			icon="<inp2:c_ModulePath module='core'/>img/icons/<inp2:ItemIcon grid='Default' icon_prefix='icon24_'/>"
 			onclick="checkCatalog(<inp2:Field name='CategoryId' db="db"/>, '<inp2:GetModulePrefix/>')"><inp2:Field name="Name"/></item>
 	</inp2:m_if>
Index: branches/5.1.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r13789 -r13903
--- branches/5.1.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 13789)
+++ branches/5.1.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 13903)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 13789 2010-06-15 21:00:24Z alex $
+* @version	$Id: categories_tag_processor.php 13903 2010-08-29 10:33:01Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -266,6 +266,9 @@
 		if (!array_key_exists('direct_link', $params) || !$params['direct_link']) {
 			$category_id = $this->getCategorySymLink( (int)$category_id );
 		}
+		else {
+			unset($params['direct_link']);
+		}
 
 		unset($params['cat_id'], $params['module']);