Index: trunk/kernel/include/debugger.php
===================================================================
diff -u -r854 -r855
--- trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 854)
+++ trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 855)
@@ -55,22 +55,19 @@
 						{
 							if( strlen($argValue) > 200 ) $traceRec['args'][$argID] = substr($argValue,0,50).' ...';	
 						}
-						$args = highlight_string('<?php '.print_r($traceRec['args'], true).'?>', true);
-						$args = preg_replace('/&lt;\?php (.*)\?&gt;/s','$1',$args);
+						$args = $this->highlightString(print_r($traceRec['args'], true));
 						$ret .= '<div id="'.$argsID.'" style="display: none;">'.$args.'</div>';
 						
 						$i++;
 					}
-					/*$ret = highlight_string('<?php '.print_r($trace, true).'?>', true);
-					$ret = preg_replace('/&lt;\?php (.*)\?&gt;/s','$1',$ret);*/
 					return $ret;
 					break;
 				
 				case 'profiler':
 					$profileKey = $Data['profile_key'];
 					$Data =& $this->ProfilerData[$profileKey];
 					$runtime = ($Data['ends'] - $Data['begins']); // in seconds
-					return '<b>Name</b>: '.$Data['description'].'. <b>Runtime</b>: '.$runtime.'s';
+					return '<b>Name</b>: '.$Data['description'].'<br><b>Runtime</b>: '.$runtime.'s';
 					break;
 						
 				default:
@@ -79,6 +76,12 @@
 			}
 		}
 		
+		function highlightString($string)
+		{
+			$string = highlight_string('<?php '.$string.'?>', true);
+			return preg_replace('/&lt;\?(.*)php (.*)\?&gt;/s','$2',$string);
+		}
+		
 		function getFileLink($file, $lineno = 1, $title = '')
 		{
 			if(!$title) $title = $file;