From c850a4e1309199262f9bfcf55ea3ad02cf87caba Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Fri, 24 Apr 2009 21:30:26 +0200
Subject: [PATCH] Fix remapping attribute keys.

---
 framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php | 6 +++---
 1 file changed, 3 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 d55c32bac..f06176d8b 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php
@@ -161,9 +161,9 @@ class Horde_Kolab_Server_Ldap extends Horde_Kolab_Server
     {
         if (!empty($this->params['map'])) {
             foreach ($this->params['map'] as $attribute => $map) {
-                if (in_array($attribute, $keys)) {
-                    $keys = array_diff($keys, array($attribute));
-                    $keys[] = $map;
+                $key = array_search($attribute, $keys);
+                if ($key !== false) {
+                    $keys[$key] = $map;
                 }
             }
         }
-- 
2.11.0