Index: branches/5.0.x/core/install/upgrades.sql
===================================================================
diff -u -r13231 -r13261
--- branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 13231)
+++ branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 13261)
@@ -1623,6 +1623,7 @@
 # ===== v 5.0.2 =====
 
 # ===== v 5.0.3-B1 =====
-ALTER TABLE	PermCache
-	ADD INDEX ( ACL );
-	
\ No newline at end of file
+ALTER TABLE	PermCache ADD INDEX (ACL);
+
+INSERT INTO ConfigurationAdmin VALUES ('cms_DefaultTrackingCode', 'la_section_SettingsWebsite', 'la_config_DefaultTrackingCode', 'textarea', NULL, 'COLS=40 ROWS=5', 10.10, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'cms_DefaultTrackingCode', '', 'In-Portal', 'in-portal:configure_advanced');
Index: branches/5.0.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -r12971 -r13261
--- branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12971)
+++ branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 13261)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 12971 2009-12-22 11:18:48Z alex $
+* @version	$Id: categories_tag_processor.php 13261 2010-03-17 17:38:32Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1236,21 +1236,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';
@@ -1274,6 +1259,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');
+				}
+				break;
+
 			default:
 				return '';
 		}
Index: branches/5.0.x/core/install/install_data.sql
===================================================================
diff -u -r12998 -r13261
--- branches/5.0.x/core/install/install_data.sql	(.../install_data.sql)	(revision 12998)
+++ branches/5.0.x/core/install/install_data.sql	(.../install_data.sql)	(revision 13261)
@@ -74,6 +74,8 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CheckStopWords', '0', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('UseVisitorTracking', 'la_section_SettingsWebsite', 'la_config_UseVisitorTracking', 'checkbox', '', '', 10.09, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseVisitorTracking', '0', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('cms_DefaultTrackingCode', 'la_section_SettingsWebsite', 'la_config_DefaultTrackingCode', 'textarea', NULL, 'COLS=40 ROWS=5', 10.10, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'cms_DefaultTrackingCode', '', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('CookieSessions', 'la_section_SettingsSession', 'la_prompt_session_management', 'select', NULL, '0=lu_opt_QueryString,1=lu_opt_Cookies,2=lu_opt_AutoDetect', 20.01, 0, 1);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CookieSessions', '2', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('SessionCookieName', 'la_section_SettingsSession', 'la_prompt_session_cookie_name', 'text', '', '', 20.02, 0, 1);