From 0a96bdf74d829cd230718243eeb733ad4e71bf5a Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 16 Jul 2014 11:38:01 +0200
Subject: Don't overwrite the whole fieldmap so autocomplete names are resolved
 correctly

---
 plugins/acl/acl.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 3e3bca9e1..5c4deb770 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -696,10 +696,8 @@ class acl extends rcube_plugin
         }
 
         // add UID field to fieldmap, so it will be returned in a record with name
-        $config['fieldmap'] = array(
-            'name' => $name_field,
-            'uid'  => $uid_field,
-        );
+        $config['fieldmap']['name'] = $name_field;
+        $config['fieldmap']['uid']  = $uid_field;
 
         // search in UID and name fields
         $config['search_fields']   = array_values($config['fieldmap']);
-- 
cgit v1.2.3