Index: branches/unlabeled/unlabeled-1.38.2/core/kernel/utility/debugger.php
===================================================================
diff -u -N -r4533 -r4570
--- branches/unlabeled/unlabeled-1.38.2/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 4533)
+++ branches/unlabeled/unlabeled-1.38.2/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 4570)
@@ -586,6 +586,9 @@
 				$this->profileFinish('script_runtime');
 				if( dbg_ConstOn('DBG_ZEND_PRESENT') ) return;
 
+				if (defined('SPACER_URL')) {
+					$this->dummyImage = SPACER_URL;
+				}
 				dbg_safeDefine('DBG_RAISE_ON_WARNINGS',0);
 
 				$this->memoryUsage['debugger_start']=memory_get_usage();
@@ -982,11 +985,9 @@
 
 				if( dbg_ConstOn('DBG_IGNORE_STRICT_ERRORS') && defined('E_STRICT') && ($errno == E_STRICT) ) return;
 
-				$long_id_pos=strrpos($errstr,'#');
-				if($long_id_pos!==false)
-				{
+				if (preg_match('/(.*)#([\d]+)$/', $errstr, $rets) ) {
 					// replace short message with long one (due triger_error limitations on message size)
-					$long_id=substr($errstr,$long_id_pos+1,strlen($errstr));
+					$long_id = $rets[2];
 					$errstr=$this->longErrors[$long_id];
 					unset($this->longErrors[$long_id]);
 				}
@@ -1027,6 +1028,19 @@
 					exit;
 				}
 			}
+			function breakOutofBuffering($flush=true)
+			{
+				while (ob_get_level())
+				{
+					if ($flush) {
+						ob_end_flush();
+					}
+					else {
+						ob_end_clean();
+					}
+				}
+				//ob_end_flush();
+			}
 
 			function breakOutofBuffering($flush=true)
 			{