From 818b78a89381be2f4de55c4f6a189da9379a1a3a Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Tue, 17 Nov 2015 12:41:07 -0500 Subject: [PATCH] Fix invalid LDAP query in ACL user autocompletion (#1490591) --- plugins/acl/acl.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php index 0393a3d..2526683 100644 --- a/plugins/acl/acl.php +++ b/plugins/acl/acl.php @@ -739,7 +739,11 @@ $config['fieldmap']['uid'] = $uid_field; // search in UID and name fields - $config['search_fields'] = array_values($config['fieldmap']); + // $name_field can be in a form of <field>:<modifier> (#1490591) + $name_field = preg_replace('/:.*$/', '', $name_field); + $search = array_unique(array($name_field, $uid_field)); + + $config['search_fields'] = $search; $config['required_fields'] = array($uid_field); // set search filter -- Gitblit v1.9.1