In-Portal Issue Tracker

Index: core/units/categories/categories_tag_processor.php
===================================================================
--- core/units/categories/categories_tag_processor.php	(revision 13134)
+++ core/units/categories/categories_tag_processor.php	(working copy)
@@ -1235,18 +1235,20 @@
 	function PageInfo($params)
 	{
 		$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');
+			if (!EDITING_MODE) {
+				$page_info = $page->GetDBField('IndexTools');
+				if ($page_info) {
+					return $page_info;
 				}
 				else {
-					return $this->Application->ConfigValue('cms_DefaultIndextoolsCode');
+					if (PROTOCOL == 'https://') {
+						return $this->Application->ConfigValue('cms_DefaultIndextoolsCode_SSL');
+					}
+					else {
+						return $this->Application->ConfigValue('cms_DefaultIndextoolsCode');
+					}
 				}
 			}
 		}

Index: core/install/upgrades.sql
===================================================================
--- core/install/upgrades.sql	(revision 13152)
+++ core/install/upgrades.sql	(working copy)
@@ -1620,4 +1620,8 @@
 
 # ===== v 5.0.2-RC1 =====
 
-# ===== v 5.0.2 =====
\ No newline at end of file
+# ===== v 5.0.2 =====
+
+# ===== v 5.0.3-B1 =====
+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: core/install/install_data.sql
===================================================================
--- core/install/install_data.sql	(revision 13152)
+++ core/install/install_data.sql	(working copy)
@@ -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);
Index: core/units/categories/categories_tag_processor.php
===================================================================
--- core/units/categories/categories_tag_processor.php	(revision 13152)
+++ core/units/categories/categories_tag_processor.php	(working copy)
@@ -1235,19 +1235,11 @@
 	function PageInfo($params)
 	{
 		$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');
-				}
+		
+		if ( in_array($params['type'], Array('tracking', 'index_tools')) ) {
+			if (!EDITING_MODE) {
+				$tracking = $page->GetDBField('IndexTools');
+				return $tracking ? $tracking : $this->Application->ConfigValue('cms_DefaultTrackingCode');
 			}
 		}
 

Index: categories_tag_processor.php
===================================================================
--- categories_tag_processor.php	(revision 13274)
+++ categories_tag_processor.php	(working copy)
@@ -1266,7 +1266,7 @@
 					$tracking = $page->GetDBField('IndexTools');
 					return $tracking ? $tracking : $this->Application->ConfigValue('cms_DefaultTrackingCode');
 				}
-				break;
+				// no break here on purpose
 
 			default:
 				return '';