Index: branches/unlabeled/unlabeled-1.38.2/core/kernel/utility/debugger.php
===================================================================
diff -u -N -r4570 -r4573
--- branches/unlabeled/unlabeled-1.38.2/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 4570)
+++ branches/unlabeled/unlabeled-1.38.2/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 4573)
@@ -19,7 +19,7 @@
 		{
 			if( substr($rq_name,0,6)=='debug_' )
 			{
-				//dbg_safeDefine('DBG_ZEND_PRESENT', 1);
+				dbg_safeDefine('DBG_ZEND_PRESENT', 1);
 				break;
 			}
 		}
@@ -260,8 +260,6 @@
 
 			function processTraceArguments(&$traceArgs)
 			{
-				$traceArgs = 'X';
-				return '';
 				if(!$traceArgs) return '';
 
 				$array_keys = array_keys($traceArgs);
@@ -271,7 +269,7 @@
 
 					if( is_array($argValue) || is_object($argValue) )
 					{
-						if(is_object($argValue) && !in_array(get_class($argValue),$this->RecursionStack) && count($this->RecursionStack) < 2)
+						if(is_object($argValue) && !in_array(get_class($argValue),$this->RecursionStack) )
 						{
 							array_push($this->RecursionStack, get_class($argValue));
 
@@ -286,7 +284,7 @@
 							$this->processTraceArguments($argValue);
 							array_pop($this->RecursionStack);
 						}
-						elseif(is_object($argValue) && in_array(get_class($argValue),$this->RecursionStack) && count($this->RecursionStack) >= 2)
+						elseif(is_object($argValue) && in_array(get_class($argValue),$this->RecursionStack) )
 						{
 							// object & in stack - recursion
 							$traceArgs[$argID] = '**** RECURSION ***';
@@ -726,9 +724,6 @@
 				<?php
 				while ($i < $lineCount)
 				{
-					if ($i>99) {
-						echo '';
-					}
 					echo '<tr class="debug_row_'.(($i % 2) ? 'odd' : 'even').'"><td class="debug_cell">'.$this->prepareHTML($i).'</td></tr>';
 					$i++;
 				}
@@ -1024,11 +1019,11 @@
 					$this->breakOutofBuffering(false);
 					echo '<script language="javascript">var $isFatalError = 1;</script>';
 					ob_flush();
-					if( !dbg_ConstOn('DBG_USE_SHUTDOWN_FUNC') || dbg_ConstOn('DBG_DBG_EVEN_WITH_ZEND')) $this->printReport();
+					if( !dbg_ConstOn('DBG_USE_SHUTDOWN_FUNC') ) $this->printReport();
 					exit;
 				}
 			}
-			function breakOutofBuffering($flush=true)
+			function breakOutofBuffering($flush = true)
 			{
 				while (ob_get_level())
 				{
@@ -1042,20 +1037,6 @@
 				//ob_end_flush();
 			}
 
-			function breakOutofBuffering($flush=true)
-			{
-				while (ob_get_level())
-				{
-					if ($flush) {
-						ob_end_flush();
-					}
-					else {
-						ob_end_clean();
-					}
-				}
-				//ob_end_flush();
-			}
-
 			function saveToFile($msg)
 			{
 				$fp = fopen($_SERVER['DOCUMENT_ROOT'].'/vb_debug.txt', 'a');