Index: trunk/kernel/startup.php
===================================================================
diff -u -N -r3008 -r3216
--- trunk/kernel/startup.php	(.../startup.php)	(revision 3008)
+++ trunk/kernel/startup.php	(.../startup.php)	(revision 3216)
@@ -21,7 +21,7 @@
 		include_once(FULL_PATH.'/kernel/kernel4/startup.php');
 		
 		// just to make sure that this is correctly detected
-		if( defined('DEBUG_MODE') && DEBUG_MODE ) $debugger->appendHTML('FULL_PATH: <b>'.FULL_PATH.'</b>');
+		if( IsDebugMode() ) $debugger->appendHTML('FULL_PATH: <b>'.FULL_PATH.'</b>');
 		
 		$application =& kApplication::Instance();
 		$application->Init();
@@ -76,7 +76,7 @@
 require_once(FULL_PATH.'/compat.php');
 /* set global variables and module lists */
 
-include_once(FULL_PATH.'/kernel/include/'.( IsDebugMode() ? 'debugger.php' : 'debugger_dummy.php') );
+if( constOn('DEBUG_MODE') ) include_once(FULL_PATH.'/kernel/include/debugger.php');
 
 	// put all non-checked checkboxes in $_POST & $_REQUEST with 0 values
 	if( GetVar('form_fields') )
@@ -193,7 +193,7 @@
 LogEntry("Startup complete\n");
 include_once("include/modules.php"); 
 
-if( defined('DEBUG_MODE') && constant('DEBUG_MODE') == 1 && function_exists('DebugByFile') ) DebugByFile();
+if( IsDebugMode() && function_exists('DebugByFile') ) DebugByFile();
 
 /* startup is complete, so now check the mail queue to see if there's anything that needs to be sent*/
 $objEmailQueue->SendMailQeue();