From 16bccbba470c7fa0507186f8b9189f69d5e2f473 Mon Sep 17 00:00:00 2001 From: biakaveron Date: Sat, 1 Dec 2012 14:13:30 +0400 Subject: [PATCH] fixes for v3.3 conventions --- classes/Debugtoolbar.php | 2 +- classes/Kohana/Debugtoolbar.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/Debugtoolbar.php b/classes/Debugtoolbar.php index bf5b3b6..0f3734d 100644 --- a/classes/Debugtoolbar.php +++ b/classes/Debugtoolbar.php @@ -8,4 +8,4 @@ * @author Brotkin Ivan (BIakaVeron) * @author Sergei Gladkovskiy */ -abstract class DebugToolbar extends Kohana_DebugToolbar {} \ No newline at end of file +abstract class DebugToolbar extends Kohana_Debugtoolbar {} \ No newline at end of file diff --git a/classes/Kohana/Debugtoolbar.php b/classes/Kohana/Debugtoolbar.php index 3137f16..13fcdc0 100644 --- a/classes/Kohana/Debugtoolbar.php +++ b/classes/Kohana/Debugtoolbar.php @@ -8,7 +8,7 @@ * @author Ivan Brotkin (BIakaVeron) * @author Sergei Gladkovskiy */ -abstract class Kohana_DebugToolbar { +abstract class Kohana_Debugtoolbar { /** * Queries container @@ -153,7 +153,7 @@ abstract class Kohana_DebugToolbar { foreach (self::$_custom_tabs as $tab => $data) { - if (is_array($data) OR is_object($data)) + if (is_array($data) OR is_object($data) OR is_bool($data)) { $data = Debug::dump($data); } @@ -396,7 +396,7 @@ abstract class Kohana_DebugToolbar { ucfirst($group), ucwords($benchmark['name']), number_format($benchmark['total_time'], 3).' s', - text::bytes($benchmark['total_memory']), + Text::bytes($benchmark['total_memory']), ); } }