File 0004-Fix-regression-in-LDAP-fuzzy-search-where-... of Package roundcubemail

File 0004-Fix-regression-in-LDAP-fuzzy-search-where-it-always-.patch of Package roundcubemail (Revision 48)

Currently displaying revision 48 , Show latest

From 0fffea28c14e435ac63dc34c2d864dd17ac58b5d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 31 Mar 2017 09:45:21 +0200
Subject: [PATCH 4/6] 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 e345387..fb04e76 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
 ===========================
 
 - Fix so 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.2.4
 -------------
diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
index 6778d9b..441a6a3 100644
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@@ -840,7 +840,7 @@ class rcube_ldap extends rcube_addressbook
             }
 
             // 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
-- 
2.9.3