From: Chuck Hagenbuch <chuck@horde.org>
Date: Fri, 29 May 2009 03:28:03 +0000 (-0400)
Subject: make sure that the formatter can be specified in the constructor
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=069ae7ae903e148655c5e0b03218295b361e2897;p=horde.git

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 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') {