Index: branches/5.3.x/core/kernel/utility/debugger.php
===================================================================
diff -u -N -r15677 -r15902
--- branches/5.3.x/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 15677)
+++ branches/5.3.x/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 15902)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: debugger.php 15677 2013-01-17 18:52:50Z alex $
+* @version	$Id: debugger.php 15902 2013-07-12 15:37:15Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -450,15 +450,10 @@
 					'DBG_DOMVIEWER'				=>	'/temp/domviewer.html',		// path to DOMViewer on website
 					'DOC_ROOT'					=>	str_replace('\\', '/', realpath($_SERVER['DOCUMENT_ROOT']) ), // windows hack
 					'DBG_LOCAL_BASE_PATH'		=>	'w:',						// replace DOC_ROOT in filenames (in errors) using this path
+					'DBG_EDITOR_URL'			=>	'file://%F:%L',
 					'DBG_SHORTCUT'				=>	'F12',						// Defines debugger activation shortcut (any symbols or Ctrl/Alt/Shift are allowed, e.g. Ctrl+Alt+F12)
 				);
 
-				// only for IE, in case if no windows php script editor defined
-				if (!defined('DBG_EDITOR')) {
-//					$dbg_constMap['DBG_EDITOR'] = 'c:\Program Files\UltraEdit\uedit32.exe %F/%L';
-					$dbg_constMap['DBG_EDITOR'] = 'c:\Program Files\Zend\ZendStudio-5.2.0\bin\ZDE.exe %F';
-				}
-
 				// debugger is initialized before kHTTPQuery, so do jQuery headers check here too
 				if (array_key_exists('HTTP_X_REQUESTED_WITH', $_SERVER) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') {
 					$this->_isAjax = true;
@@ -936,23 +931,21 @@
 			 * Returns link for editing php file (from error) in external editor
 			 *
 			 * @param string $file filename with path from root folder
-			 * @param int $lineno line number in file where error is found
+			 * @param int $line_number line number in file where error is found
 			 * @param string $title text to show on file edit link
 			 * @return string
 			 * @access public
 			 */
-			public function getFileLink($file, $lineno = 1, $title = '')
+			public function getFileLink($file, $line_number = 1, $title = '')
 			{
 				if ( !$title ) {
 					$title = str_replace('/', '\\', $this->getLocalFile($file));
 				}
 
-				if ( $this->isGecko() ) {
-					return '<a href="file://' . $this->getLocalFile($file) . '">' . $title . '</a>';
-				}
-				else {
-					return '<a href="javascript:$Debugger.editFile(\'' . $this->getLocalFile($file) . '\', ' . $lineno . ');" title="' . $file . '">' . $title . '</a>';
-				}
+				$url = str_replace('%F', $this->getLocalFile($file), DBG_EDITOR_URL);
+				$url = str_replace('%L', $line_number, $url);
+
+				return '<a href="' . $url . '">' . $title . '</a>';
 			}
 
 			/**
@@ -1147,7 +1140,7 @@
 								$value = '<b class="debug_error">no value</b>';
 							}
 							else {
-								$value = htmlspecialchars($this->print_r($value, true), null, 'UTF-8');
+								$value = htmlspecialchars($this->print_r($value, true), ENT_QUOTES, 'UTF-8');
 							}
 
 							echo '<tr><td>' . $prefix . '</td><td>' . $key . '</td><td>' . $value . '</td></tr>';
@@ -1215,7 +1208,7 @@
 					$this->ProfilerData[$key]['file'] = $trace_results[$i]['file'];
 					$this->ProfilerData[$key]['line'] = $trace_results[$i]['line'];
 
-					if ( array_key_exists('object', $trace_results[$i + 1]) && isset($trace_results[$i + 1]['object']->Prefix) ) {
+					if ( isset($trace_results[$i + 1]['object']) && isset($trace_results[$i + 1]['object']->Prefix) ) {
 						$object =& $trace_results[$i + 1]['object'];
 						/* @var $object kBase */
 
@@ -1600,7 +1593,6 @@
 						$Debugger.createEnvironment(<?php echo DBG_WINDOW_WIDTH; ?>, <?php echo $this->getWindowWidth(); ?>);
 
 						$Debugger.DOMViewerURL = '<?php echo constant('DBG_DOMVIEWER'); ?>';
-						$Debugger.EditorPath = '<?php echo defined('DBG_EDITOR') ? addslashes(DBG_EDITOR) : '' ?>';
 						$Debugger.DebugURL = '<?php echo $this->baseURL.'/debugger_responce.php?sid='.$this->rowSeparator.'&path='.urlencode($dbg_path); ?>';
 						$Debugger.EventURL = '<?php echo /*is_object($application->Factory) &&*/ $application->InitDone ? $application->HREF('dummy', '', Array ('pass' => 'm', '__NO_REWRITE__' => 1)) : ''; ?>';
 						$Debugger.BasePath = '<?php echo $this->basePath; ?>';