Index: branches/5.0.x/core/kernel/startup.php
===================================================================
diff -u -r12299 -r12323
--- branches/5.0.x/core/kernel/startup.php	(.../startup.php)	(revision 12299)
+++ branches/5.0.x/core/kernel/startup.php	(.../startup.php)	(revision 12323)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: startup.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: startup.php 12323 2009-08-17 20:39:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -19,17 +19,16 @@
 	if (!function_exists('getmicrotime')) {
 		function getmicrotime()
 		{
-	    list($usec, $sec) = explode(" ", microtime());
-	    return ((float)$usec + (float)$sec);
+			list($usec, $sec) = explode(" ", microtime());
+			return ((float)$usec + (float)$sec);
 		}
 	}
+
 	$globals_start = getmicrotime();
 	include_once(KERNEL_PATH . '/globals.php');	// non OOP functions used through kernel, e.g. print_pre
 	include_once(KERNEL_PATH . '/utility/multibyte.php');	// emulating multi-byte php extension
 	$globals_end = getmicrotime();
 
-	define('INPORTAL_ENV', 1);
-
 	$vars = parse_portal_ini(FULL_PATH . '/config.php');
 
 	$admin_directory = isset($vars['AdminDirectory']) ? $vars['AdminDirectory'] : '/admin';
@@ -50,8 +49,6 @@
 	safeDefine('BASE_PATH', $ps); // in case in-portal has defined it before
 	# New path detection method: end
 
-	safeDefine('INPORTAL_TAGS', true);
-	safeDefine('NPARSER', 1); // New Parser is enabled
 	safeDefine('SERVER_NAME', $_SERVER['HTTP_HOST'] ? $_SERVER['HTTP_HOST'] : $vars['Domain']);
 
 	$https_mark = getArrayValue($_SERVER, 'HTTPS');
@@ -106,17 +103,18 @@
 
 	safeDefine('EDITOR_PATH', isset($vars['EditorPath']) ? $vars['EditorPath'] : '/core/editor/');
 
-	if( ini_get('safe_mode') ) define('SAFE_MODE', 1);
+	if (ini_get('safe_mode')) {
+		// safe mode will be removed at all in PHP6
+		define('SAFE_MODE', 1);
+	}
 
-	safeDefine('EXPERIMENTAL_PRE_PARSE', 1);
-
-	if( file_exists(FULL_PATH . '/debug.php') )
-	{
+	if (file_exists(FULL_PATH . '/debug.php')) {
 		include_once(FULL_PATH . '/debug.php');
-		if(isset($dbg_options['DEBUG_MODE']) && $dbg_options['DEBUG_MODE']) {
+		if (array_key_exists('DEBUG_MODE', $dbg_options) && $dbg_options['DEBUG_MODE']) {
 			$debugger_start = getmicrotime();
 			include_once(KERNEL_PATH . '/utility/debugger.php');
 			$debugger_end = getmicrotime();
+
 			if (isset($debugger) && constOn('DBG_PROFILE_INCLUDES')) {
 				$debugger->profileStart('inc_globals', KERNEL_PATH . '/globals.php', $globals_start);
 				$debugger->profileFinish('inc_globals', KERNEL_PATH . '/globals.php', $globals_end);
@@ -153,14 +151,10 @@
 		$debugger->AttachToApplication();
 	}
 
-	if( !function_exists('adodb_mktime') ) include_once(KERNEL_PATH . '/utility/adodb-time.inc.php');
+	if( !function_exists('adodb_mktime') ) {
+		include_once(KERNEL_PATH . '/utility/adodb-time.inc.php');
+	}
 
-//	include_once(KERNEL_PATH . '/utility/temp_handler.php'); // needed because of static calls from kBase
-	// up to here
-
 	// global constants
 	define ('KG_TO_POUND', 2.20462262);
-	define ('POUND_TO_KG', 0.45359237);
-
-
-?>
\ No newline at end of file
+	define ('POUND_TO_KG', 0.45359237);
\ No newline at end of file