make sure that the formatter can be specified in the constructor

diff --git a/framework/Log/lib/Horde/Log/Handler/Firebug.php b/framework/Log/lib/Horde/Log/Handler/Firebug.php
index f209eb8..077d92b 100644 (file)
--- 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 bea99a8..6302be0 100644 (file)
--- 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') {