From 19fcc35a5521511eb6d00d06c6573e425b68fff0 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 31 Mar 2017 09:45:21 +0200 Subject: [PATCH] Fix regression in LDAP fuzzy search where it always used prefix search instead (#5713) --- CHANGELOG | 1 + program/lib/Roundcube/rcube_ldap.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 231d9c4f389..7112ace193a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -26,6 +26,7 @@ CHANGELOG Roundcube Webmail - Fix/rephrase "unsaved changes" warning when cancelling a draft (#5610) - Fix XSS issue in handling of a style tag inside of an svg element [CVE-2017-6820] - Fix bug where settings/upload.inc could not be used by plugins (#5694) +- Fix regression in LDAP fuzzy search where it always used prefix search instead (#5713) RELEASE 1.3-beta ---------------- diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php index 201b677039e..444ce05e2f2 100644 --- a/program/lib/Roundcube/rcube_ldap.php +++ b/program/lib/Roundcube/rcube_ldap.php @@ -840,7 +840,7 @@ function search($fields, $value, $mode=0, $select=true, $nocount=false, $require } // compose a full-text-like search filter - $filter = rcube_ldap_generic::fulltext_search_filter($value, $attributes, $mode); + $filter = rcube_ldap_generic::fulltext_search_filter($value, $attributes, $mode & ~rcube_addressbook::SEARCH_GROUPS); } // add required (non empty) fields filter