Projects / Debug Kit

diff --git a/views/debug.php b/views/debug.php index 4c39464..3912acb 100644 --- a/views/debug.php +++ b/views/debug.php @@ -40,7 +40,7 @@ class DebugView extends DoppelGangerView { * * @var string */ - var $_oldExtension = null; + var $_oldExtension = array(); /** * Overload _render to capture filenames and time actual rendering of each view file * @@ -50,9 +50,8 @@ class DebugView extends DoppelGangerView { * @access protected */ function _render($___viewFn, $___dataForView, $loadHelpers = true, $cached = false) { - if (isset($this->_oldExtension)) { + if (isset($this->_oldExtension) && strstr($___viewFn, '.debug_view')) { $___viewFn = substr($___viewFn, 0, -10) . $this->_oldExtension; - $this->_oldExtension = null; } if (!isset($___dataForView['disableTimer'])) { DebugKitDebugger::startTimer('render_' . basename($___viewFn), sprintf(__('Rendering %s', true), Debugger::trimPath($___viewFn))); diff --git a/views/helpers/html_toolbar.php b/views/helpers/html_toolbar.php index 7388559..fc58014 100644 --- a/views/helpers/html_toolbar.php +++ b/views/helpers/html_toolbar.php @@ -142,8 +142,8 @@ class HtmlToolbarHelper extends ToolbarHelper { $view->output = preg_replace('#</head>#', $head . "\n</head>", $view->output, 1); } $toolbar = $view->element('debug_toolbar', array('plugin' => 'debug_kit', 'disableTimer' => true)); - if (preg_match('#</body>\s*</html>#', $view->output)) { - $view->output = preg_replace('#</body>\s*</html>#', $toolbar . "\n</body>\n</html>", $view->output, 1); + if (preg_match('#</body>#', $view->output)) { + $view->output = preg_replace('#</body>#', $toolbar . "\n</body>", $view->output, 1); } } }