Index: branches/5.1.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r13544 -r13545
--- branches/5.1.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 13544)
+++ branches/5.1.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 13545)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 13544 2010-05-11 17:44:26Z alex $
+* @version	$Id: categories_tag_processor.php 13545 2010-05-11 19:19:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -260,7 +260,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']);
 
@@ -659,7 +661,7 @@
 
 		$params['name'] = $params['render_as'];
 		$params['skip_prefixes'] = implode(',', $skip_prefixes);
-		return $this->Application->ParseBlock($params, 1);
+		return $this->Application->ParseBlock($params);
 	}
 
 	/**
@@ -1003,6 +1005,7 @@
 			$params['grid_name'] .= 'ShowAll';
 		}
 
+		// use $pass_params to be able to pass 'tab_init' parameter from m_ModuleInclude tag
 		return $this->Application->ParseBlock($params, 1);
 	}
 
@@ -1247,21 +1250,6 @@
 	{
 		$page =& $this->_getPage($params);
 
-		if ($params['type'] == 'index_tools') {
-			$page_info = $page->GetDBField('IndexTools');
-			if ($page_info) {
-				return $page_info;
-			}
-			else {
-				if (PROTOCOL == 'https://') {
-					return $this->Application->ConfigValue('cms_DefaultIndextoolsCode_SSL');
-				}
-				else {
-					return $this->Application->ConfigValue('cms_DefaultIndextoolsCode');
-				}
-			}
-		}
-
 		switch ($params['type']) {
 			case 'title':
 				$db_field = 'Title';
@@ -1289,6 +1277,14 @@
 				$cat_field = 'Description';
 				break;
 
+			case 'tracking':
+			case 'index_tools':
+				if (!EDITING_MODE) {
+					$tracking = $page->GetDBField('IndexTools');
+					return $tracking ? $tracking : $this->Application->ConfigValue('cms_DefaultTrackingCode');
+				}
+				// no break here on purpose
+
 			default:
 				return '';
 		}
@@ -1625,7 +1621,7 @@
 
 		while (!$list->EOL()) {
 			$block_params['path'] = $list->GetDBField('Path');
-			$o .= $this->Application->ParseBlock($block_params, 1);
+			$o .= $this->Application->ParseBlock($block_params);
 
 			$list->GoNext();
 		}