From 069ae7ae903e148655c5e0b03218295b361e2897 Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Thu, 28 May 2009 23:28:03 -0400 Subject: [PATCH] make sure that the formatter can be specified in the constructor --- framework/Log/lib/Horde/Log/Handler/Firebug.php | 9 +++++++-- framework/Log/lib/Horde/Log/Handler/Stream.php | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/framework/Log/lib/Horde/Log/Handler/Firebug.php b/framework/Log/lib/Horde/Log/Handler/Firebug.php index f209eb869..077d92bc4 100644 --- a/framework/Log/lib/Horde/Log/Handler/Firebug.php +++ b/framework/Log/lib/Horde/Log/Handler/Firebug.php @@ -57,10 +57,15 @@ class Horde_Log_Handler_Firebug extends Horde_Log_Handler_Base /** * Class Constructor + * + * @param Horde_Log_Formatter_Interface $formatter Log formatter */ - public function __construct() + public function __construct($formatter = null) { - $this->_formatter = new Horde_Log_Formatter_Simple(); + if (is_null($formatter)) { + $formatter = new Horde_Log_Formatter_Simple(); + } + $this->_formatter = $formatter; } /** diff --git a/framework/Log/lib/Horde/Log/Handler/Stream.php b/framework/Log/lib/Horde/Log/Handler/Stream.php index bea99a8fb..6302be02c 100644 --- a/framework/Log/lib/Horde/Log/Handler/Stream.php +++ b/framework/Log/lib/Horde/Log/Handler/Stream.php @@ -41,10 +41,14 @@ class Horde_Log_Handler_Stream extends Horde_Log_Handler_Base * * @param mixed $streamOrUrl Stream or URL to open as a stream * @param string $mode Mode, only applicable if a URL is given + * @param Horde_Log_Formatter_Interface $formatter Log formatter */ - public function __construct($streamOrUrl, $mode = 'a+') + public function __construct($streamOrUrl, $mode = 'a+', $formatter = null) { - $this->_formatter = new Horde_Log_Formatter_Simple(); + if (is_null($formatter)) { + $formatter = new Horde_Log_Formatter_Simple(); + } + $this->_formatter = $formatter; if (is_resource($streamOrUrl)) { if (get_resource_type($streamOrUrl) != 'stream') { -- 2.11.0