oreolek
/
debug-toolbar
mirror of https://github.com/Oreolek/debug-toolbar.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #17 from soar/3.2 

Fix for auto_render logic issue.
This commit is contained in:
Ivan Brotkin 2011-08-29 13:11:02 -07:00
parent 634eac2d1b a3a47f5615
commit 48b031af62
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/kohana/debugtoolbar.php
View File

@ -409,15 +409,11 @@ abstract class Kohana_DebugToolbar {
// Don't auto render toolbar for cli requests
if (Kohana::$is_cli)
return FALSE;
// Don't auto render toolbar if $_GET['debug'] = 'false'
if (isset($_GET['debug']) and strtolower($_GET['debug']) == 'false')
return FALSE;
// Don't auto render if auto_render config is FALSE
if ($config->auto_render !== TRUE)
return FALSE;
return TRUE;
}
}

3
init.php
View File

@ -8,4 +8,5 @@ if(Kohana::$config->load('debug_toolbar.firephp_enabled') === TRUE){
require_once $firePHP;
}
// Render Debug Toolbar on the end of application execution
register_shutdown_function('debugtoolbar::render');
if (Kohana::$config->load('debug_toolbar.auto_render') === TRUE)
register_shutdown_function('debugtoolbar::render');