From a5a384b267bdca88b63be6df403aa2000f3dc13c Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Tue, 14 Apr 2009 06:29:45 +0200 Subject: [PATCH] WS --- framework/Kolab_Server/lib/Horde/Kolab/Server.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Server.php index bda39a5c5..ee291e5ed 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server.php @@ -144,10 +144,10 @@ abstract class Horde_Kolab_Server $server_params = array(); - if (!empty($params['driver'])) { + if (!empty($params['driver'])) { $driver = $params['driver']; unset($params['driver']); - } else if (isset($conf['kolab']['server']['driver'])) { + } else if (isset($conf['kolab']['server']['driver'])) { $driver = $conf['kolab']['server']['driver']; if (isset($conf['kolab']['server']['params'])) { $server_params = $conf['kolab']['server']['params']; @@ -422,7 +422,7 @@ abstract class Horde_Kolab_Server */ $classes = array_reverse($classes); - $types = array('defined', 'required', 'derived', 'collapsed', + $types = array('defined', 'required', 'derived', 'collapsed', 'defaults', 'locked', 'object_classes'); foreach ($types as $type) { $$type = array(); -- 2.11.0