From 50c9a7f91bdd982f7f2be5ff316297712d73c1f8 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Tue, 21 Dec 2010 22:30:32 +0100
Subject: [PATCH] Reuse the existing option.

---
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Base.php               | 2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Folder.php             | 2 +-
 framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/Module/BaseTest.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Base.php b/framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Base.php
index 2d48916ae..a488a207f 100644
--- a/framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Base.php
+++ b/framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Base.php
@@ -173,7 +173,7 @@ Choices are:
         }
         if (isset($options['log'])) {
             if (class_exists('Horde_Log_Logger')) {
-                $options['logger'] = new Horde_Log_Logger(
+                $options['log'] = new Horde_Log_Logger(
                     new Horde_Log_Handler_Stream(
                         $options['log']
                     )
diff --git a/framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Folder.php b/framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Folder.php
index c6867a4a3..77c1e6b69 100644
--- a/framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Folder.php
+++ b/framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Folder.php
@@ -167,7 +167,7 @@ implements Horde_Kolab_Cli_Module
             array(
                 'driver' => $options['driver'],
                 'params' => $options,
-                'logger' => isset($options['logger']) ? $options['logger'] : null,
+                'logger' => isset($options['log']) ? $options['log'] : null,
             )
         );
     }
diff --git a/framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/Module/BaseTest.php b/framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/Module/BaseTest.php
index 0b04d0bc7..7467f9441 100644
--- a/framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/Module/BaseTest.php
+++ b/framework/Kolab_Cli/test/Horde/Kolab/Cli/Unit/Cli/Module/BaseTest.php
@@ -76,7 +76,7 @@ extends Horde_Kolab_Cli_TestCase
         $arguments = array();
         $base = new Horde_Kolab_Cli_Module_Base();
         $base->handleArguments($options, $arguments);
-        $this->assertContains('logger', array_keys($options));
+        $this->assertContains('log', array_keys($options));
     }
 
     public function testLoggerClass()
@@ -85,7 +85,7 @@ extends Horde_Kolab_Cli_TestCase
         $arguments = array();
         $base = new Horde_Kolab_Cli_Module_Base();
         $base->handleArguments($options, $arguments);
-        $this->assertInstanceOf('Horde_Log_Logger', $options['logger']);
+        $this->assertInstanceOf('Horde_Log_Logger', $options['log']);
     }
 
     private function _storeErrorHandling()
-- 
2.11.0