From 588df221359adebcd180233f92f33241eb3ac1b8 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Mon, 6 Apr 2009 08:10:29 +0200 Subject: [PATCH] Correct the basic calls for handling object ids and identifying the object types. --- framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php index fb25297a7..04b7b42cd 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php @@ -504,8 +504,11 @@ class Horde_Kolab_Server_Ldap extends Horde_Kolab_Server return $oc; } catch (Horde_Kolab_Server_Exception $e) { } + if ($oc == 'top') { + return 'Horde_Kolab_Server_Object'; + } } - throw new Horde_Kolab_Server_Exception(sprintf(_("Unkown Kolab object type for UID %s."), + throw new Horde_Kolab_Server_Exception(sprintf(_("Unkown object type for UID %s."), $uid)); } @@ -524,8 +527,7 @@ class Horde_Kolab_Server_Ldap extends Horde_Kolab_Server { switch ($type) { default: - Horde_Kolab_Server_Object::loadClass($type); - call_user_func(array($type, 'generateServerUid'), $id, $info); + return sprintf('%s,%s', $id, $this->getBaseUid()); } } } -- 2.11.0