Index: trunk/kernel/include/debugger.php
===================================================================
diff -u -r2578 -r2581
--- trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 2578)
+++ trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 2581)
@@ -1,10 +1,10 @@
 <?php
 
-	if(!class_exists('Debugger'))
+	if( !class_exists('Debugger') )
 	{
 		function dbg_ConstOn($const_name)
 		{
-			return defined($const_name)&&constant($const_name);
+			return defined($const_name) && constant($const_name);
 		}
 		
 		function dbg_safeDefine($const_name,$const_value)
@@ -19,7 +19,7 @@
 		{
 			if( substr($rq_name,0,6)=='debug_' )
 			{
-				define('DBG_ZEND_PRESENT',1);
+				dbg_safeDefine('DBG_ZEND_PRESENT', 1);
 				break;
 			} 
 		}
@@ -955,9 +955,21 @@
 		}
 		
 		$debugger = new Debugger();
-		if(dbg_ConstOn('DBG_HANDLE_ERRORS')) set_error_handler( array(&$debugger,'saveError')  );
-		if(dbg_ConstOn('DBG_USE_SHUTDOWN_FUNC')) {
-			register_shutdown_function( array(&$debugger,'printReport') );
+		
+		if( dbg_ConstOn('DBG_HANDLE_ERRORS') )
+		{
+			if( class_exists('kApplication') )
+			{
+				$application =& kApplication::Instance();
+				$application->Debugger =& $debugger;
+				$application->errorHandlers[] = Array(&$debugger, 'saveError');
+			}
+			else
+			{
+				set_error_handler( Array(&$debugger, 'saveError')  );
+			}
 		}
+
+		if( dbg_ConstOn('DBG_USE_SHUTDOWN_FUNC') ) register_shutdown_function( Array(&$debugger, 'printReport') );
 	}
 ?>
\ No newline at end of file