From ba0f4b4013f87cfed72f6070c6e623e034d9351b Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Sat, 11 Apr 2009 09:25:20 +0200
Subject: [PATCH] Set the driver for testing in the parameters.

---
 framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php
index 777c21164..65abd8736 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php
@@ -299,14 +299,14 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase
      */
     public function &prepareLdapKolabServer()
     {
-        global $conf;
-
         $base = getenv('HORDE_BASE');
         if (!empty($base)) {
             $config = $base . '/config/kolab.php';
             if (file_exists($config)) {
                 @include $config; 
                 if (!empty($conf['kolab']['server']['params'])) {
+                    $params = $conf['kolab']['server']['params'];
+                    $params['driver'] = 'ldap';
                     return Horde_Kolab_Server::singleton($params);
                 }
             }
-- 
2.11.0