Index: trunk/admin/include/elements.php
===================================================================
diff -u -N -r624 -r820
--- trunk/admin/include/elements.php	(.../elements.php)	(revision 624)
+++ trunk/admin/include/elements.php	(.../elements.php)	(revision 820)
@@ -452,13 +452,12 @@
 //Page Footer
 function int_footer()
 {
-  global $objSession;
-
-  if($objSession->HasSystemPermission("DEBUG.INFO"))
-  {
-      //phpinfo();
-  } 
-   print <<<END
+	global $objSession;
+	if($objSession->HasSystemPermission("DEBUG.INFO"))
+	{
+		//phpinfo();
+	}
+	print <<<END
  </body>
 </html>
 END;
Index: trunk/kernel/include/debugger.php
===================================================================
diff -u -N -r817 -r820
--- trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 817)
+++ trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 820)
@@ -27,7 +27,7 @@
 			switch($Data['debug_type'])
 			{
 				case 'error':
-					$fileLink = $this->getFileLink($Data['file']);
+					$fileLink = $this->getFileLink($Data['file'],$Data['line']);
 					$ret = '<b class="debug_error">'.$this->getErrorNameByCode($Data['no']).'</b>: '.$Data['str'];
 					$ret .= ' in <b>'.$fileLink.'</b> on line <b>'.$Data['line'].'</b>';
 					return $ret;
@@ -47,7 +47,7 @@
 					{
 						$traceRec =& $trace[$i];
 						$argsID = 'trace_args_'.$dataIndex.'_'.$i;
-						$ret .= '<a href="javascript:toggleTraceArgs(\''.$argsID.'\');" title="Show/Hide Function Arguments"><b>Function</b></a>: '.$this->getFileLink($traceRec['file'],$traceRec['class'].$traceRec['type'].$traceRec['function']).'';
+						$ret .= '<a href="javascript:toggleTraceArgs(\''.$argsID.'\');" title="Show/Hide Function Arguments"><b>Function</b></a>: '.$this->getFileLink($traceRec['file'],$traceRec['line'],$traceRec['class'].$traceRec['type'].$traceRec['function']).'';
 						$ret .= ' in <b>'.basename($traceRec['file']).'</b> on line <b>'.$traceRec['line'].'</b><br>';
 						
 						// ensure parameter value is not longer then 200 symbols
@@ -72,10 +72,10 @@
 			}
 		}
 		
-		function getFileLink($file, $title = '')
+		function getFileLink($file, $lineno = 1, $title = '')
 		{
 			if(!$title) $title = $file;
-			return '<a href="javascript:editFile(\''.$this->getLocalFile($file).'\');" title="'.$file.'">'.$title.'</a>';	
+			return '<a href="javascript:editFile(\''.$this->getLocalFile($file).'\','.$lineno.');" title="'.$file.'">'.$title.'</a>';	
 		}
 		
 		function getLocalFile($remoteFile)
@@ -201,14 +201,15 @@
 						return $ret;
 					}
 					
-					function editFile($FileName)
+					function editFile($fileName,$lineNo)
 					{
-						var $EditorPath = '<?php echo defined('WINDOWS_EDITOR') ? addslashes(WINDOWS_EDITOR) : '' ?>';
-						if($EditorPath)
+						var $editorPath = '<?php echo defined('WINDOWS_EDITOR') ? addslashes(WINDOWS_EDITOR) : '' ?>';
+						if($editorPath)
 						{
 							var $obj = new ActiveXObject("LaunchinIE.Launch");
-							//alert('lauching: ['+$EditorPath+' '+$FileName+']');
-							$obj.LaunchApplication($EditorPath+' '+$FileName);
+							$editorPath = $editorPath.replace('%F',$fileName);
+							$editorPath = $editorPath.replace('%L',$lineNo);
+							$obj.LaunchApplication($editorPath);
 						}
 						else
 						{