Index: branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl
===================================================================
diff -u -N -r12561 -r13341
--- branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 12561)
+++ branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 13341)
@@ -5,14 +5,14 @@
 			name="<inp2:Field name='Name'/>"
 			href="<inp2:CategoryLink template='catalog/catalog' pass='m' m_opener='r'/>"
 			icon="<inp2:c_ModulePath module='core'/>img/icons/icon24_section<inp2:m_if check='FieldEquals' name='CreatedBySystem' value='1'>_system</inp2:m_if>.png"
-			onclick="checkCatalog(<inp2:m_if check="Field" name="SymLinkCategoryId" db="db"><inp2:Field name="SymLinkCategoryId" db="db"/><inp2:m_else/><inp2:Field name='CategoryId' db="db"/></inp2:m_if>, '<inp2:GetModulePrefix/>')"
-			load_url="<inp2:CategoryLink pass='m'/>">
+			onclick="checkCatalog(<inp2:Field name='CategoryId' db="db"/>, '<inp2:GetModulePrefix/>')"
+			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'/>"
 			icon="<inp2:c_ModulePath module='core'/>img/icons/icon24_section<inp2:m_if check='FieldEquals' name='CreatedBySystem' value='1'>_system</inp2:m_if>.png"
-			onclick="checkCatalog(<inp2:m_if check="Field" name="SymLinkCategoryId" db="db"><inp2:Field name="SymLinkCategoryId" db="db"/><inp2:m_else/><inp2:Field name='CategoryId' db="db"/></inp2:m_if>, '<inp2:GetModulePrefix/>')"><inp2:Field name="Name"/></item>
+			onclick="checkCatalog(<inp2:Field name='CategoryId' db="db"/>, '<inp2:GetModulePrefix/>')"><inp2:Field name="Name"/></item>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 <tree>
Index: branches/5.0.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r13278 -r13341
--- branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 13278)
+++ branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 13341)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 13278 2010-03-22 20:04:45Z alex $
+* @version	$Id: categories_tag_processor.php 13341 2010-04-06 08:16:22Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -256,7 +256,9 @@
 			$category_id = $this->Application->GetVar('m_cat_id');
 		}
 
-		$category_id = $this->getCategorySymLink( (int)$category_id );
+		if (!array_key_exists('direct_link', $params) || !$params['direct_link']) {
+			$category_id = $this->getCategorySymLink( (int)$category_id );
+		}
 
 		unset($params['cat_id'], $params['module']);