Index: branches/5.3.x/core/kernel/utility/debugger.php =================================================================== diff -u -N -r16730 -r16815 --- branches/5.3.x/core/kernel/utility/debugger.php (.../debugger.php) (revision 16730) +++ branches/5.3.x/core/kernel/utility/debugger.php (.../debugger.php) (revision 16815) @@ -1,6 +1,6 @@ '', 'params' => array()); - - /** * Creates instance of debugger */ public function __construct() @@ -504,31 +497,9 @@ foreach ($dbg_constMap as $dbg_constName => $dbg_constValue) { DebuggerUtil::safeDefine($dbg_constName, $dbg_constValue); } - - $this->parseEditorUrl(); } /** - * Parses editor url. - * - * @return void - */ - protected function parseEditorUrl() - { - $components = parse_url(DBG_EDITOR_URL); - - $this->editorUrlData['url'] = $components['scheme'] . '://' . $components['host']; - - if ( isset($components['path']) ) { - $this->editorUrlData['url'] .= $components['path']; - } - - if ( isset($components['query']) ) { - parse_str(html_entity_decode($components['query']), $this->editorUrlData['params']); - } - } - - /** * Performs debugger initialization * * @return void @@ -1033,22 +1004,17 @@ */ public function getFileLink($file, $line_number = 1, $title = '') { - if ( !$title ) { - $title = str_replace('/', '\\', $this->getLocalFile($file)); - } - $local_file = $this->getLocalFile($file); - $url_params = $this->editorUrlData['params']; - foreach ( $url_params as $param_name => $param_value ) { - $url_params[$param_name] = str_replace( - array('%F', '%L'), - array($local_file, $line_number), - $param_value - ); + if ( !$title ) { + $title = str_replace('/', '\\', $local_file); } - $url = $this->editorUrlData['url'] . '?' . http_build_query($url_params); + $url = str_ireplace( + array('%F', '%L'), + array(urlencode($local_file), urlencode($line_number)), + DBG_EDITOR_URL + ); return '' . $title . ''; }