From 2acf20ecbfd7d3a2fece9bc3fcf00d957fc9b1f1 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 13 Oct 2010 17:49:44 +0000 Subject: [PATCH] See Changelog Monotone-Parent: a5879e0ca48fa60369415c062b9a5b8e85b3cb84 Monotone-Revision: 60e52d42356476440191e2ecbde8c0be6697337d Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-10-13T17:49:44 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ SoObjects/SOGo/LDAPSource.m | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1dda660e6..673042b63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-10-13 Francis Lachapelle + * SoObjects/SOGo/LDAPSource.m (_qualifierForUIDFilter:): removed + duplicated constraints in the filter when using bind fields. + * UI/WebServerResources/HTMLElement.js (deselectAll): fixed a bug where the properties where not removed from the proper element (table instead of the tbody). diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m index 8d2722f1d..8844be790 100644 --- a/SoObjects/SOGo/LDAPSource.m +++ b/SoObjects/SOGo/LDAPSource.m @@ -593,7 +593,11 @@ static NSArray *commonSearchFields; { bindFieldsEnum = [bindFields objectEnumerator]; while ((currentField = [bindFieldsEnum nextObject])) - [qs appendFormat: @" OR (%@='%@')", [currentField stringByTrimmingSpaces], escapedUid]; + { + if ([currentField caseInsensitiveCompare: UIDField] != NSOrderedSame + && ![mailFields containsObject: currentField]) + [qs appendFormat: @" OR (%@='%@')", [currentField stringByTrimmingSpaces], escapedUid]; + } } if (_filter && [_filter length])