Index: branches/5.2.x/core/kernel/utility/debugger.php =================================================================== diff -u -N -r16544 -r16728 --- branches/5.2.x/core/kernel/utility/debugger.php (.../debugger.php) (revision 16544) +++ branches/5.2.x/core/kernel/utility/debugger.php (.../debugger.php) (revision 16728) @@ -1,6 +1,6 @@ scrollbarWidth = $this->isGecko() ? 22 : 25; - $this->appendRequest(); + // Mark place, where request information will be inserted. + $this->HeaderEndingDataIndex = count($this->Data); } /** @@ -1120,6 +1128,28 @@ } /** + * Inserts HTML code without transformations at given position + * + * @param string $html HTML. + * @param integer $position Position. + * + * @return integer + */ + public function insertHTML($html, $position) + { + array_splice( + $this->Data, + $position, + 0, + array( + array('html' => $html, 'debug_type' => 'html'), + ) + ); + + return $position + 1; + } + + /** * Returns instance of FirePHP class * * @return FirePHP @@ -1209,9 +1239,18 @@ $script = $_SERVER['DOCUMENT_ROOT'] . $_SERVER['PHP_SELF']; } - $this->appendHTML('ScriptName: ' . $this->getFileLink($script, 1, basename($script)) . ' (' . dirname($script) . ')'); + $insert_at_index = $this->HeaderEndingDataIndex; + + $insert_at_index = $this->insertHTML( + 'ScriptName: ' . $this->getFileLink($script, 1, basename($script)) . ' (' . dirname($script) . ')', + $insert_at_index + ); + if ( $this->_isAjax ) { - $this->appendHTML('RequestURI: ' . $_SERVER['REQUEST_URI'] . ' (QS Length:' . strlen($_SERVER['QUERY_STRING']) . ')'); + $insert_at_index = $this->insertHTML( + 'RequestURI: ' . $_SERVER['REQUEST_URI'] . ' (QS Length:' . strlen($_SERVER['QUERY_STRING']) . ')', + $insert_at_index + ); } $tools_html = '
' . $this->_getToolsHTML() . ' |