Index: trunk/core/kernel/utility/debugger.php
===================================================================
diff -u -r2363 -r2566
--- trunk/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 2363)
+++ trunk/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 2566)
@@ -31,7 +31,6 @@
 							'DBG_USE_HIGHLIGHT'=>1,
 							'DBG_USE_SHUTDOWN_FUNC'=>DBG_ZEND_PRESENT?0:1,
 							'DBG_HANDLE_ERRORS'=>DBG_ZEND_PRESENT?0:1,
-							'DBG_SHOW_MEMORY_USAGE'=>1,
 							'DBG_IGNORE_STRICT_ERRORS'=>1,
 							'DBG_DOMVIEWER'=>'/temp/domviewer.html',
 							'DOC_ROOT'=> str_replace('\\', '/', realpath($_SERVER['DOCUMENT_ROOT']) ), // windows hack 
@@ -797,22 +796,28 @@
 						}
 					</script>
 				<?php
-				$this->memoryUsage['debugger_finish']=memory_get_usage();
-				$this->memoryUsage['print_report']=$this->memoryUsage['debugger_finish']-$this->memoryUsage['debugger_start'];
-				$this->memoryUsage['total']=$this->memoryUsage['print_report']+$this->memoryUsage['error_handling'];
-				$this->memoryUsage['application']=memory_get_usage()-$this->memoryUsage['total'];
-				if($returnResult)
-				{
-					$ret = ob_get_contents();
-					ob_clean();
-					if( dbg_ConstOn('DBG_SHOW_MEMORY_USAGE') ) $ret.=$this->getMemoryUsageReport();
-					return $ret;
-				}
-				else
-				{
-					ob_end_flush();
-					if( dbg_ConstOn('DBG_SHOW_MEMORY_USAGE') ) echo $this->getMemoryUsageReport();
-				}
+				
+					dbg_safeDefine('DBG_SHOW_MEMORY_USAGE', 1);
+					if( dbg_ConstOn('DBG_SHOW_MEMORY_USAGE') )
+					{
+						$this->memoryUsage['debugger_finish']=memory_get_usage();
+						$this->memoryUsage['print_report']=$this->memoryUsage['debugger_finish']-$this->memoryUsage['debugger_start'];
+						$this->memoryUsage['total']=$this->memoryUsage['print_report']+$this->memoryUsage['error_handling'];
+						$this->memoryUsage['application']=memory_get_usage()-$this->memoryUsage['total'];
+					}
+					
+					if($returnResult)
+					{
+						$ret = ob_get_contents();
+						ob_clean();
+						if( dbg_ConstOn('DBG_SHOW_MEMORY_USAGE') ) $ret .= $this->getMemoryUsageReport();
+						return $ret;
+					}
+					else
+					{
+						ob_end_flush();
+						if( dbg_ConstOn('DBG_SHOW_MEMORY_USAGE') ) echo $this->getMemoryUsageReport();
+					}
 			}
 			
 			/**
@@ -823,7 +828,9 @@
 			 */
 			function getMemoryUsageReport()
 			{
-				$info=Array('<a href="javascript:self.location.reload()">printReport</a>'=>'print_report',
+				if( !dbg_ConstOn('DBG_SHOW_MEMORY_USAGE') ) return '';
+				
+				$info = Array('<a href="javascript:self.location.reload()">printReport</a>'=>'print_report',
 							'saveError'=>'error_handling',
 							'Total'=>'total',
 							'Application'=>'application');
@@ -872,10 +879,10 @@
 				/*in /www/kostja/in-commerce4/kernel/kernel4/parser/construct_tags.php(177) : runtime-created function on line 
 				
 				[PRE-PARSED block, $line 13]: Undefined variable: IdField*/
-				
+				/*
 				if( strpos($errfile,'runtime-created') !== false ) {
 					$errfile = ' PRE-PARSED block <b>'.$this->CurrentPreParsedBlock.'</b> ';
-				}
+				}*/
 				
 				if( strpos($errfile,'eval()\'d code') !== false )
 				{